moar mountains
Merge branch 'master' of https://github.com/creftan/clone

Conflicts:
	startScene.lua