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 pull request #50 from fma2/storyboard-clean-up

Modify search results scene, remove non-autocomplete search page from storyboard
formatting for GMSMarkerFactory
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
Merge branch 'development' of https://github.com/red-spotted-newts-2014/bike-path into storyboard-clean-up