fix merge conflict
Merge branch 'master' into snake

Conflicts:
	terrain.js
merged old master into snake
Merge branch 'master' into snake

Conflicts:
	kink.js
new height calculation
minor tweaking for debug purposes
Fixed getYValue
Merge