Merge origin/master

Conflicts:
	src/byui/cit260/LostOnAnIsland/control/ChallengeControl.java
	src/byui/cit260/LostOnAnIsland/objectModeling/GameTest.java