Hint fix
Merge branch 'master' of github.com:byrneb/four4s

Conflicts:
	js/app.js