Aaron's EDITS LIKE A BAMF
Yeahhhhhhhhhhh :s

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

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