no message
Merge branch 'develop' of https://github.com/mew2057/SuperAwesomePeopleDoingAwesomeThings into develop

Conflicts:
	SuperAwesomeProject/Assembly-CSharp-firstpass-vs.csproj
	SuperAwesomeProject/Assembly-CSharp-firstpass.csproj
	SuperAwesomeProject/Assembly-CSharp-vs.csproj
	SuperAwesomeProject/Assembly-CSharp.csproj
	SuperAwesomeProject/Assembly-UnityScript-firstpass-vs.unityproj
	SuperAwesomeProject/Assembly-UnityScript-firstpass.unityproj
	SuperAwesomeProject/Assembly-UnityScript-vs.unityproj
	SuperAwesomeProject/Assembly-UnityScript.unityproj
	SuperAwesomeProject/Assets/custom/Terrain.asset
	SuperAwesomeProject/ProjectSettings/ProjectSettings.asset
	SuperAwesomeProject/SuperAwesomeProject-csharp.sln
	SuperAwesomeProject/SuperAwesomeProject.sln