fixed bugs

[+] fixed bugs[cad]
user prefs

user prefs
Merge remote-tracking branch 'origin/master'

Conflicts:
	FlappyBird/FlappyBird.userprefs
	FlappyBird/FlappyBird/FlappyBird.pidb
	FlappyBird/FlappyBird/GameoverScene.cs

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/AsteroidHit.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/BGLoop.mp3

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/GameOver.mp3

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/Lazer1.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/LevelOneBackGround.mp3

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/MenuScreenBackgroundMusic.mp3

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/ShipDying.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/ShipHit.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/collectLifePowerup.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/rocketLaunch.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Audio/rocketPickupSound.wav

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Sce.PlayStation.HighLevel.GameEngine2D.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/Sce.PlayStation.HighLevel.UI.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/System.Core.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/System.Json.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/System.Runtime.Serialization.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/System.ServiceModel.Web.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/System.ServiceModel.dll

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/System.Xml.dll
	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/app.exe

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/app.exe.mdb

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/edata.list
	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/psse.list

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/shaders/Texture.cgx

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Back.jpg

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/BackgroundGameMenu.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/BackgroundGameOver.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/BackgroundLevel1.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/HUD/BulletCounterSymbol.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/HUD/healthbarRed2.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/HUD/healthbarRed3.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/HUD/healthbar_background.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/HUD/healthbar_red.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Menu.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Option.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/OptionsBackground.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Pickups/LifePickup.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Pickups/RocketPickup.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Retry.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Rocket.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/Start.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/asteroid.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/bullet2.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/explosion.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/player2.png

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-signed/Application/textures/ship
sheet.png
	FlappyBird/FlappyBird/bin/Debug/FlappyBird-unsigned/Application/app.exe

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-unsigned/Application/app.exe.mdb

	FlappyBird/FlappyBird/bin/Debug/FlappyBird-unsigned/Application/shaders/Texture.cgx
	FlappyBird/FlappyBird/bin/Debug/FlappyBird.psdp
	FlappyBird/FlappyBird/bin/Debug/FlappyBird.pspp
	FlappyBird/FlappyBird/obj/Debug/FlappyBird.csproj.FileListAbsolute.txt
	FlappyBird/FlappyBird/obj/Debug/app.exe
	FlappyBird/FlappyBird/obj/Debug/app.pdb
	FlappyBird/FlappyBird/obj/Debug/convertedpdb/app.exe.mdb
	FlappyBird/FlappyBird/obj/Debug/shaders/shaders/Texture.cgx