game ok
reupload
Merge branch 'master' of https://github.com/b-small/TeamAllusah

Conflicts:
	2DShooter/SpaceShooter.v12.suo
	2DShooter/_2DShooter/bin/x86/Debug/_2DShooter.exe
	2DShooter/_2DShooter/bin/x86/Debug/_2DShooter.pdb
	2DShooter/_2DShooter/obj/x86/Debug/ContentPipeline-{B81B824F-9857-42F6-AAD5-F47FBE511AE5}.xml
	2DShooter/_2DShooter/obj/x86/Debug/_2DShooter.csproj.FileListAbsolute.txt
	2DShooter/_2DShooter/obj/x86/Debug/_2DShooter.exe
	2DShooter/_2DShooter/obj/x86/Debug/_2DShooter.pdb
	2DShooter/_2DShooterContent/_2DShooterContent.contentproj
Merge branch 'master' of https://github.com/b-small/TeamAllusah

Conflicts:
	2DShooter/SpaceShooter.sln
	2DShooter/_2DShooter/Asteroid.cs
	2DShooter/_2DShooter/Bullet.cs
	2DShooter/_2DShooter/Game1.cs
	2DShooter/_2DShooter/Player.cs
	2DShooter/_2DShooter/Program.cs
	2DShooter/_2DShooter/Properties/AssemblyInfo.cs
	2DShooter/_2DShooter/Starfield.cs
	2DShooter/_2DShooter/_2DShooter.csproj
	2DShooter/_2DShooter/bin/x86/Debug/_2DShooter.exe
	2DShooter/_2DShooter/bin/x86/Debug/_2DShooter.pdb
	2DShooter/_2DShooterContent/_2DShooterContent.contentproj
testing after merge