Merge origin/master

Conflicts:
	walkTheDog/src/byui/cit260/walkTheDog/view/MainMenuView.java