update to merged version
Merge branch 'master' into Atlas
new screens & change level length
Merge branch 'Atlas'

Conflicts:
	CoryDash.js
	CoryDash_v2.js