I have no idea what this is
Merge branch 'master' of https://github.com/brittnigustaf/teamWumpus.git

Conflicts:
	eecs285.proj4.Wumpus/src/eecs285/proj4/wumpus/Dwarf.java