Merge origin/master

Conflicts:
	src/ablehunter/java/AbleHunter.java
	src/byui/cit260/ableHunter/control/GameControl.java
	src/byui/cit260/ableHunter/control/MountainControl.java
	src/byui/cit260/ableHunter/view/AbleHunterStartView.java
	src/byui/cit260/ableHunter/view/PlayGameMenu.java
Merge origin/master

Conflicts:
	src/byui/cit260/ableHunter/control/CharacterControl.java