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

Conflicts:
	SuperAwesomeProject/Assembly-CSharp-vs.csproj
	SuperAwesomeProject/Assembly-UnityScript-vs.unityproj
music
Merge branch 'develop' of https://github.com/mew2057/SuperAwesomePeopleDoingAwesomeThings into develop

Conflicts:
	SuperAwesomeProject/Assembly-CSharp-vs.csproj
	SuperAwesomeProject/Assembly-UnityScript-vs.unityproj
	SuperAwesomeProject/SuperAwesomeProject-csharp.sln
	SuperAwesomeProject/SuperAwesomeProject.sln
	SuperAwesomeProject/SuperAwesomeProject.userprefs