small changes? want to check out master
Jcomponent has been added to make weapons panel as well
Merge branch 'DisplayFeatures' of
https://github.com/ProfAmesBC/Game2013.git into DisplayFeatures

Conflicts:
	src/game/BatsEverywhere.java