Prepare for edgar's merge
Merge branch 'master' of github.com:dcarrot2/RideSafe

Conflicts:
	app/src/main/res/layout/activity_login.xml
Merge branch 'master' of github.com:dcarrot2/RideSafe
Removed action bar