Merge pull request #17 from gonch/ad_game

added powerBar and fireButton
added music
Merge branch 'master' of https://github.com/gonch/JungleArena
Merge branch 'master' into ga_Music

Conflicts:
	src/com/tdt4240/A6/junglearena/screens/GameScreen.java
Merge pull request #18 from gonch/ga_Music

added music
fixing