jessica's changes
Merge branch 'master' of https://github.com/brittnigustaf/teamWumpus.git

Conflicts:
	eecs285.proj4.Wumpus/eecs285/proj4/wumpus/Dwarf.java
	eecs285.proj4.Wumpus/eecs285/proj4/wumpus/ImageList.java
	eecs285.proj4.Wumpus/eecs285/proj4/wumpus/dummyGo.java
Merge branch 'master' of https://github.com/brittnigustaf/teamWumpus.git