Bleh
Merge branch 'master' of https://github.com/Atrus7/tag-the-wall

Conflicts:
	manifest.json