Merge branch 'master' of gitlab.cs.wallawalla.edu:sturaa/cptr142_group_project

Inventory.cpp

 //filename: Inventory.cpp
-//Contains the implementation of the more complicated functions from the item class, which represents the items the player is carrying in the form of several dynamic arrays.
+//Contains the implementation of the more complicated functions from the inventory class, which represents the items the player is carrying in the form of a dynamic array.
 
 #include <iostream> //for output
 #include <vector>

Inventory.h

@@ -18,7 +18,7 @@ class Inventory{
 	int equipped; // holds the index of the item currently equipped
 	
 	public:
-	//Constructs a new Item class.
+	//Constructs a new Inventory class.
 	Inventory();
 
     //Accepts a string and three ints from the Monster class, and adds it into the 'array' of inventory.