not sure.
Merge branch 'master' of https://github.com/pherg/Turreted

Conflicts:
	Unity/Turreted/Assembly-CSharp.pidb
	Unity/Turreted/Assets/Resources/Materials/Bullet.mat
	Unity/Turreted/Turreted-csharp.sln
	Unity/Turreted/Turreted.sln
	Unity/Turreted/Turreted.userprefs
Merge branch 'master' of https://github.com/pherg/Turreted
Pulling.
Merge branch 'master' of https://github.com/pherg/Turreted

Conflicts:
	Unity/Turreted/Assembly-CSharp.pidb
	Unity/Turreted/Assets/Resources/Materials/Bullet.mat
	Unity/Turreted/Turreted-csharp.sln
	Unity/Turreted/Turreted.sln
	Unity/Turreted/Turreted.userprefs
Merge branch 'master' of https://github.com/pherg/Turreted

Conflicts:
	Unity/Turreted/Assembly-CSharp.pidb
	Unity/Turreted/Assembly-UnityScript-vs.unityproj
	Unity/Turreted/Assembly-UnityScript.unityproj
	Unity/Turreted/Turreted-csharp.sln
	Unity/Turreted/Turreted.sln
Merge branch 'master' of https://github.com/pherg/Turreted

Conflicts:
	Unity/Turreted/Assembly-CSharp.pidb
	Unity/Turreted/Assembly-UnityScript-vs.unityproj
	Unity/Turreted/Assembly-UnityScript.unityproj
	Unity/Turreted/Turreted-csharp.sln
	Unity/Turreted/Turreted.sln
Ignore file wtf