...
Merge branch 'master' of https://github.com/Jesserockz/GameConcept

Conflicts:
	Assembly-CSharp.pidb
	Game Concept.userprefs