Some more search data from google
Merged conflicts
Fixing merge conflicts
adding to .gitignore
Merge branch 'master' into list-view