collect all the stuffs
Merge branch 'master' of https://github.com/bmason87/ridesnag

Conflicts:
	views/login