this stupid fucking search bar is finally doing something
Merge branch 'master' of github.com:vise890/flickrpedia