Merging to master branch
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
Made player location on minimap red for better visibility
Working on how Power Up manager handles lists.  Fixed errors in
generating initial locations.
Merge branch 'master' into ItemsWithInventory

Conflicts:
	minimap.png
made splash logo for game
Merge branch 'master' into DisplayFeatures

Conflicts:
	minimap.png
	src/game/BatsEverywhere.java