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
Fix merge conflict with upstream master
Trying different ways to make results appear in table
Add object properties for Search item - some commented out
Search List Controller view methods
Modify Search Map View Controller - still not showing results
Fix merge issues
Merge branch 'master' of https://github.com/red-spotted-newts-2014/bike-path into version-1
fix white space, comments, debugging, general formatting