Initial changes for db
Adding cyride maps
Merge pull request #10 from seancavanaugh/cyride_maps

Adding cyride maps
Changes to resResult
Spacing
Fixed db errors
restaurant and restaurantResults to send to derek
Merge branch 'restaurantSearch' of https://github.com/jcurtiss/skynet into resResults

Conflicts:
	CyBite App/src/com/DatabaseAPI/Restaurant.java

Fixed conflicts and merged jeremys code in.
added maps stuff
Merge branch 'master' of https://github.com/CyBite/skynet into resResults

Conflicts:
	CyBite App/AndroidManifest.xml
Merge branch 'maps_manifest_stuff' of https://github.com/seancavanaugh/skynet into resResults

Conflicts:
	CyBite App/AndroidManifest.xml
Fixed changes and merged swans changes into branch.
Removed unused buttons
Merge pull request #11 from daotoo/resResults

Search for restaurants and bring up results
fixed sql statement
Merge pull request #12 from daotoo/resResults

Fixed sql statement in database for restaurant searching
cyride map changes

added blue and brown bus routes & changed arraylist from global to local
to fix bug in PrepCyRideMapsActivity.java
Nearby maps
Merge pull request #13 from seancavanaugh/maps_manifest_stuff

Nearby maps