Random shit
Merge branch 'master' of github.com:vszhang/pennapps2014

Conflicts:
	manifest.json
	popup.html
	popup.js