Merge origin/master

Conflicts:
	src/byui/cit260/ableHunter/control/ArmorControl.java
	src/byui/cit260/ableHunter/control/SceneControl.java
	src/byui/cit260/ableHunter/control/WeaponsControl.java