Merge origin/master

Conflicts:
	walkTheDog/src/byui/cit260/walkTheDog/control/ExploringEventsControl.java
	walkTheDog/src/byui/cit260/walkTheDog/control/GameControl.java