Added tabbed swipes to MyRides, fixed various bugs. Switch statements
Merge branch 'master' of github.com:elioht/CalHacks

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/activity_login.xml
	res/values/strings.xml
	src/com/unsigned/innovations/CalHacks/MainActivity.java
	src/com/unsigned/innovations/CalHacks/SplashActivity.java
Merge branch 'master' of github.com:elioht/CalHacks
adding fragment instances to navigation bar