handle onclick
Merge branch 'master' of github.com:s8mlu/rover

Conflicts:
	public/javascripts/script.js