working notes
Merge branch 'master' of https://github.com/Hsad/Untie

Conflicts:
	ProjectFiles/Assembly-CSharp-vs.csproj
	ProjectFiles/Assembly-CSharp.csproj