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
restored minimap
Merge branch 'master' of local repository into LiangMummy

Conflicts:
	minimap.png
	src/creatures/Mummy.java
	src/game/BatsEverywhere.java
Added button information to the sidebar so that users know how to use
the Jetpack and Teleporter Items.
Merge remote-tracking branch 'origin/LiangMummy'

Conflicts:
	src/creatures/Mummy.java
Merge branch 'catsrabbits'

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

Conflicts:
	minimap.png
Fixed spacing for the on-screen current item count representations.
Small changes