updates with some of my and jessica's stuff
jessica's changes
get up to date for pull
Merge branch 'master' of
https://lithas%40umich.edu@github.com/brittnigustaf/teamWumpus.git

Conflicts:
	eecs285.proj4.Wumpus/eecs285/proj4/wumpus/GameWindow.java