eg. 'wrapper', 'category:python' or '"document database"'
Merge branch 'master' of git.pantoto.org:mouchak/mouchak Resolve Conflicts: mouchak/templates/index.html
