Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/View/GameMenuView.java