Added files to allow merge
Pull files from origin master
Merge branch 'master' of https://github.com/red-spotted-newts-2014/bike-path
Added files to merge"
Merge with origin master
Merge with upstream master
Remove next link on 2nd view
Change cancel segue from final page
Add call to hide keyboard after search button is selected
Remove NSLogs
Add search bar hide when cancel button clicked
Change buttons to move between screens
Change in buttons
Minor empty line mod
Merge pull request #20 from fma2/view-fixes

Changes to view routing for UX