omitted minimap screenshot as a saved png file, this image kept causing
conflicts with checkouts/pulls
Merge branch 'DisplayFeatures' of
https://github.com/ProfAmesBC/Game2013.git into DisplayFeatures

Conflicts:
	src/game/BatsEverywhere.java