See Equipment.java line 43
Merge branch 'master' of https://github.com/omnivescence/156-project

Conflicts:
	bin/data/Equipment.class
	src/data/Equipment.java