added the findRide activity which is a custom list view for that I had to modify the custom_row xml,
I also had to add the custom List activity. The FindRide activity needs more work.
Merge branch 'master' of github.com:Elioht/CalHacks

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/custom_row.xml
	res/values/strings.xml
	src/com/unsigned/innovations/CalHacks/MainActivity.java
Merge branch 'master' of github.com:Elioht/CalHacks

Conflicts:
	AndroidManifest.xml
	res/layout/custom_row.xml
	res/values/strings.xml
	src/com/unsigned/innovations/CalHacks/MainActivity.java
Merge branch 'master' of github.com:Elioht/CalHacks

Conflicts:
	AndroidManifest.xml
	project.properties
Merge branch 'master' of github.com:Elioht/CalHacks
Modified android manifest in order to begin the application at the splashScreen