merge
Merge branch 'development' of https://github.com/red-spotted-newts-2014/bike-path into development
merge
Conflicts:
	bikepath.xcworkspace/xcshareddata/bikepath.xccheckout
Merge branch 'development' of https://github.com/red-spotted-newts-2014/bike-path into development
merge
Merge branch 'development' of https://github.com/red-spotted-newts-2014/bike-path into storyboard-clean-up
Change placeholder text for searchbar to enter your destination
formatting for GMSMarkerFactory
Remove my location button
refactor of StationFinder. Removed unecessary for loop, redefinition of variables, and set initial closest station to one of the stations, rather than DBL_MAX
Merge pull request #51 from armenvartan/armen-refactor-stationfinder

Armen refactor stationfinder
Resolve navigation method - I hope - kept commented NSLogs just in case- still need to test on device
Merge branch 'development' of https://github.com/red-spotted-newts-2014/bike-path into storyboard-clean-up
Add search bar and modify map view on search bar page - beginning of moving things over
Move methods from Google Autocomplete Test View Controller to Search Map
Fix the navigation I changed earlier to test - its back to what it was - sorry
Change segues - now one from first screen to last screen
Move map up on initial scene, add mylocation methods to search map view controller
Merge pull request #52 from fma2/storyboard-clean-up

Remove my location button on results page, change placeholder text on search page, hopefully resolve navigation method issue

From Farheen: Google Autocomplete and its search functionalities has been moved from 2nd page to initial page.  2nd page has been de-linked on storyboard.
Merge branch 'development' of github.com:red-spotted-newts-2014/bike-path