Merge origin/master

Conflicts:
	test/byui/cit260/LostOnAnIsland/control/ChallengeControlTest.java
Merge origin/master

Conflicts:
	test/byui/cit260/LostOnAnIsland/control/ChallengeControlTest.java