Update login
Merge branch 'master' of github.com:CanTireInnovations/treads

Conflicts:
	client/app/index.html
	client/app/styles/_global.scss
Merge branch 'master' of github.com:CanTireInnovations/treads
Update login view