Merge pull request #2 from ShadowStall/AlexBranch

Merge pull request #1 from ShadowStall/master
Update

Made asteroids disappear after being shot added life bar does not work
yet
Merge remote-tracking branch 'origin/AlexBranch2.0'
""

Preparing to merge branches
Added New things

[+] Life bar now functions properly, added sounds for the asteroids
being hit and the ship being hit [CAD]
Added new  things

[+] added new sounds and made life counter work[CAD]
New stuff

[+] Added projectile removal and made it better, adjusted the life bar
now works properly, also added a score counter which also works
properly[CAD]
Unused Things

[-] Deleted project folder that wasn't needed [CAD]
New Stuff

[+] Added sound when ship dies and also stopped background music when
transitioning happens between levels [CAD]
Updated files

Updated the audiomanager, gamemanager, optionscene, gameoverscene, and
menuscene[JCAL]
Fixed Game Retry

[+] Fixed retry after game over[CAD]
added both commits

[+] Fixed retry menu [CAD]
Rockets

[+] Rockets now have collision detection with the asteroids[CAD]
error binary files differ

binary files differ[CAD]
Merge remote-tracking branch 'origin/master' into AlexBranch

Conflicts:
	FlappyBird/FlappyBird/FlappyBird.pidb