Working on swipable tabs
Merge branch 'master' of github.com:dcarrot2/RideSafe
To merge Rivka's changes
Merge branch 'master' of github.com:dcarrot2/RideSafe

Conflicts:
	app/src/main/java/unsigned/atthacks/com/weride/MainActivity.java
Merge branch 'master' of github.com:dcarrot2/RideSafe