lots of changes that might not be worth keeping
Merge branch 'master' of https://github.com/gdg-nova/game1

Conflicts:
	Assets/New Terrain 1.asset
	Assets/New Terrain 4.asset