Finished core gameplay
Merge branch 'develop' of https://github.com/mew2057/SuperAwesomePeopleDoingAwesomeThings into develop

Conflicts:
	SuperAwesomeProject/SuperAwesomeProject-csharp.sln
	SuperAwesomeProject/SuperAwesomeProject.sln
	SuperAwesomeProject/SuperAwesomeProject.userprefs