Merge origin/master

Conflicts:
	src/byui/cit260/LostOnAnIsland/view/ForrestChallenge.java
	src/byui/cit260/LostOnAnIsland/view/MapMenu.java
	src/byui/cit260/LostOnAnIsland/view/QuitMenu.java
	src/byui/cit260/LostOnAnIsland/view/RiverChallenge.java
	src/byui/cit260/LostOnAnIsland/view/View.java
Merge origin/master

Conflicts:
	src/byui/cit260/LostOnAnIsland/view/ForrestChallenge.java