improved map generation
Merge branch 'master' of github.com:Pjchardt/PinkElephant

Conflicts:
	Assets/test rooms.unity
Merge branch 'master' of github.com:Pjchardt/PinkElephant
scaled player