Merge branch 'master' of https://github.com/robertsdionne/nightwitches

Conflicts:
Assets/New Terrain.asset
Assets/New Terrain.asset.meta
got rid of terrain
added 3 new terrains/game play
Merge branch 'master' into robert