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
delete extraneous lines of code
refactor of StationFinder. Removed unecessary for loop, redefinition of variables, and set initial closest station to one of the stations, rather than DBL_MAX
refactor error message
replace hard-coded message with errormessage factory output
Merge pull request #51 from armenvartan/armen-refactor-stationfinder

Armen refactor stationfinder
consolidate duplicate pragma marks
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
bug fix
clicking the yellow marker for the end point used to crash the app
I changed the title from address (which was not a valid NSString) to the first
element of the search query separated by commas
this does not crash the app, and (I think) is also usually more readable
Move map up on initial scene, add mylocation methods to search map view controller