Made it harder

Pipeheight goes 190->90
Merge remote-tracking branch 'origin/e155' into e155

Conflicts:
	js/main.js

Updated to newest values.