Merge origin/master

Conflicts:
	src/byui/cit260/LostOnAnIsland/view/ForrestChallenge.java
Merge origin/master

Conflicts:
	src/byui/cit260/LostOnAnIsland/view/ForrestChallenge.java
Merge origin/master