cleaning up
Merge branch 'master' of https://github.com/corbinmc96/HelicopterGame

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Projectiles/Enemy Bullet.prefab.BACKUP.6716.prefab
	Assets/Projectiles/Enemy Bullet.prefab.BASE.6716.prefab
	Assets/Projectiles/Enemy Bullet.prefab.LOCAL.6716.prefab
	Assets/Projectiles/Enemy Bullet.prefab.REMOTE.6716.prefab
	HelicopterGame-csharp.sln
	HelicopterGame.sln
	Library/AssetServerCacheV3
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/71/71dc95d6c756e5d4bb7cb45584c59d72