removing iFrame implementation
Merge branch 'master' into Prototype

* master:
  removing iFrame implementation

Conflicts:
	ext/src/bg/background.js
Merge pull request #1 from hawaiianchimp/Prototype

Prototype
Merge branch 'master' into Prototype

* master:
  removing iFrame implementation

Conflicts:
	ext/src/bg/background.js