With login screen almost done
Merge branch 'master' of github.com:dcarrot2/RideSafe

Conflicts:
	app/src/main/java/unsigned/atthacks/com/weride/login.java
	app/src/main/res/layout/activity_login.xml