Wtf, mate.
Merge branch 'master' of https://github.com/thomasteisberg/MetaBrowsing

Conflicts:
manifest.json
Resolving.