Merge origin/master

Conflicts:
	src/ablehunter/java/AbleHunter.java
	src/byui/cit260/ableHunter/control/GameControl.java
	src/byui/cit260/ableHunter/model/Board.java
	src/byui/cit260/ableHunter/model/Game.java
	src/byui/cit260/ableHunter/model/Inventory.java
	src/byui/cit260/ableHunter/model/TheMap.java
	src/byui/cit260/ableHunter/view/AbleHunterMainMenu.java
	src/byui/cit260/ableHunter/view/View.java