This is how we do it
Merge branch 'master' of https://github.com/KaBKa/WriteTowers

Conflicts:
	Assets/New Terrain.asset