rg
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-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.pidb
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.pidb
	Assembly-UnityScript.unityproj
	Assets/AddBomb.cs.meta
	Assets/Bossfight.unity
	Assets/James'Workspace.unity
	Assets/Lightning Assets/Lightning Emitter.prefab
	Assets/Lightning Assets/Sources/CrumpleMesh.js.meta
	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/GetPath.cs
	Assets/Scripts/KillEnemy.cs
	Assets/Scripts/Player.cs
	Assets/Scripts/PlayerInfo.cs
	Assets/Scripts/RPathGen.cs.meta
	Assets/Scripts/SpiralEmitter.cs
	Assets/Scripts/WaveEmitter.cs
	Assets/Standard Assets/Particles/Sources/Materials/Water Splash1.mat
	ProjectSettings/InputManager.asset
	cs499-csharp.sln
	cs499.sln
	cs499.userprefs