findride update
Merge branch 'master' of github.com:Elioht/CalHacks
Find ride connencts users to venmo application as well as PayPal application
Merge branch 'master' of github.com:Elioht/CalHacks

Conflicts:
	AndroidManifest.xml
	project.properties