popup magic, untested
working on stuff
Merge branch 'master' of github.com:captainclam/hc

* 'master' of github.com:captainclam/hc:
  Fuck

Conflicts:
	extension/popup.coffee
the good shit