Login is working now after the revert
Ok, now the logins are working
Styles route is working and other changes
Merge branch 'master' of https://github.com/wesleycole/Hop-Tracker

Conflicts:
	www/config.codekit
	www/css/style.css
	www/index.html
	www/sass/.sass-cache/79dcbc75334d51714e663876e2cf4de3addb02bb/style.scssc
	www/sass/_typography.scss
	www/sass/style.scss
	www/templates/login.html