merging to master
Merge branch 'master' of https://github.com/Sixtoe/ModdingFinal

Conflicts:
	Assets/New Terrain.asset