Not sure why Library isn't being ignored . . .but we'll have to move away from git anyhow...
Merge branch 'master' of https://github.com/pherg/Turreted

Conflicts:
	Unity/Turreted/Assembly-CSharp.pidb
	Unity/Turreted/Turreted-csharp.sln
	Unity/Turreted/Turreted.sln
	Unity/Turreted/Turreted.userprefs