Small changes
Movement
moving
small changes
Merge branch 'master' of local repository into LiangMummy

Conflicts:
	src/creatures/Mummy.java
Movement
Merge branch 'master' of local repository into LiangMummy
Making mummy nnot move out of bounds
minimap commit error
Changes to creature list and updates on mummmy
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
Merge branch 'master' of local repository into LiangMummy

Conflicts:
	minimap.png
	src/creatures/Mummy.java
	src/game/BatsEverywhere.java
Merge remote-tracking branch 'origin/LiangMummy'

Conflicts:
	src/creatures/Mummy.java
minimap
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
Small changes
Merge branch 'master' into LiangMummy

Conflicts:
	minimap.png
Small changes to mummy
minimap
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
	src/creatures/Robot.java