location
Merge branch 'master' of https://github.com/andrusch/Great-Fence-Of-China

Conflicts:
	Assets/Scripts/GameEngine.cs