new JS file
fixed JS conflict

Merge branch 'master' of https://github.com/nick-doherty/hopp

Conflicts:
	app/assets/javascripts/hopp.js
added About page