Prep for merge with upstream master
Merge branch 'master' of https://github.com/red-spotted-newts-2014/bike-path into version-1
Merge branch 'master' of https://github.com/red-spotted-newts-2014/bike-path into version-1
Add placeholder and cancel button
Modify search bar appearance
Minor mods to storyboard
Add property for search item object
Modify initial page to just show map, add table view page
Add view page for search and search results list
Add Search List controller methods
Modify to get search working from 1st screen -- did notwork so now have new plan
Prep for merge with upstream master
add titles to markers
Next: figure out how to pull bikes/docks available and use that info in the marker snippe. Some weird string conversion involved.
pod file and acknowledgements
working in xcworkspacedata from now on...
Revert "add titles to markers"

This reverts commit da481f5ca556e9d994f8548da5f1176c8da1ba9e.
remove unused reference to item
also, changes to marker title apparently weren't saved - fixed that
change attribution to all group names
preparing for travis-ci build
per these instructions:
http://docs.travis-ci.com/user/languages/objective-c/
add comment