login
Merge branch 'master' of http://github.com/cicer1/hintsite

Conflicts:
	js/router.js
	js/views/HintListView.js