Merge branch 'master' of ece2524.ece.vt.edu:bt2016/project/combatSim
Merge branch 'master' of ece2524.ece.vt.edu:bt2016/project/combatSim
Added error cheacking
Added increased functionality
	GenMonster(dict) returns a Monster object generated using the
		given dict
	GenWeapon(dict) does the same thing, except with weapon dicts
	GiveItem(ent, item) adds the given item to the ent's inventory
	DropItem(ent, slot) drops the item in index [slot - 1] of ent's
		inventory
	EquipItem(ent, slot) equips the item in the given slot of ent's
		inventory (unequips equipped items as well)
	All objects now have a dedicated __str__, and will behave nicely
		when print()'d
Merge branch 'master' of ece2524.ece.vt.edu:bt2016/project/combatSim
Item drop / pickup now has a message
Merge branch 'master' of ece2524.ece.vt.edu:emacob/forks/combatSim
Changed to generate weapon and monster
Changed monster dead to new variables
Added in how to run the program
Fighting now encorpates the Ent commands Attack, Focus, and Defend

Monsters can now choose one of the three Ent commands when the player
acts

Inventory system now integrated, can use 'equip slot' to equip the item
in slot number 'slot'

Items are not equipped on pickup, must be equipped by the user

Retreat now heals 1/10 of max hp, rounded down

Focus now scales from +100%, +200%, and +400% but is removed upon
defending

Changed spawning so you can only get higher level monsters after killing
a certain number (0 for Souls, 1 for Skeletons, etc.), so after killing
2 monsters you may get Dragons, Skeletons, or Souls

Changed weapon spawning so the level of monster determines the chance of
a drop and what type (10% chance to drop weapons up to Aluminum Daggers
for souls, 20% chance to drop weapons up to Bronze Swords for Skeletons,
etc.)

TODO:
Help commands need to be changed to reflect the additions / changes
Changing status messages to fit the game
Added some usage messages
added marc's code and resolved some collisions
Merge branch 'master' of ece2524.ece.vt.edu:bt2016/project/combatSim
Fixed a coding error
Updated help commands, and increased weapon chance
added a few lines to both Ent and UserInterface such that the player starts out with a weapon that is explicitly told to the user at the begining of the game. The weapon is also in the first slot of the inventory, and it is equipped.