update storyboard
Merge branch 'searchController'

merge searchController branch
add Google Places search
add .gitignore
fighting pbxproj
pbxproj, squash this into last couple commits
Merge branch 'searchController'
merge searchController into master branch
update gitignore
resolved project merge conflicts and removed storyboard ignore
Merge branch 'kirby-master'