Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/macalester/comp124/hw5/Game.java