fix
Merge branch 'master' of github.com:tashenka/Trololo

Conflicts:
	rover.js