comments
Merge branch 'master' of https://github.com/DSCAllDay/GridWorld-Game

Conflicts:
	com/company/inventoryclasses/Armor.java