update to new merge
Revert "update to new merge"

This reverts commit c069d7db592c67ef65b863b866277288924bf0ec.
Fix merging bugs
adjustments

speed of text +100
test platform generation
new art assets for UI & robots
Adjustments of game feel + energy glow + platformlanding bug fixed

Energy downgraded in a unlinear way
Jump higher and fall faster
get less energy from robots
different texts after death
platform falling bugs (fall after dashing) fixed
Boss fight + New Arts for Robots
Comments for the variables
?
Merge branch 'Atlas'

Conflicts:
	.DS_Store
	CoryDash.js