Still trying to remove Unity and VStudio files from the revisions
Merge branch 'master' of https://github.com/RLejolivet/Crapcity

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Crapcity-csharp.sln
	Crapcity.sln