fixed infinite jump
Merge branch 'master' of https://github.com/BinaryBrain/HackZurich

Conflicts:
	client/js/main.js