Merge origin/master

Conflicts:
	SurvivRexburg/src/byui/cit260/surviveRexburg/view/NewGameScreenView.java