Changed how many things work
Merge branch 'master' of https://github.com/xHatch-/whitinks

Conflicts:
	Assets/New Terrain.asset
	Assets/flat.unity