Merge branch 'master' into cole
added GPS functionality. navigating to closestStop now aquires your GPS
location and displays as a TOAST
Merge branch 'cole'
added GPS locator
Merge branch 'master' of https://github.com/pscherer413/ucsc_bus_app.git

Conflicts:
	UCSCBusBuddy/bin/UCSCBusBuddy.apk
	UCSCBusBuddy/bin/classes.dex
	UCSCBusBuddy/bin/resources.ap_