It's a game!
Merge branch 'master' of https://github.com/jdhuns2/cs499

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-CSharp.pidb
	Assembly-UnityScript.pidb
	Assets/Bossfight.unity
	Assets/James'Workspace.unity
	Assets/Models/Materials/blinn1.mat
	Assets/Prefabs/BigBoss.prefab
	Assets/Prefabs/BossSatFull.prefab
	Assets/Prefabs/Enemy.prefab
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/TestBullet.prefab
	Assets/Scripts/Boss Scripts/SatilliteInfo.cs
	Assets/Scripts/KillEnemy.cs
	Assets/Scripts/Player.cs
	Assets/Scripts/PlayerInfo.cs
	Assets/Scripts/SpiralEmitter.cs
	cs499-csharp.sln
	cs499.sln
	cs499.userprefs