Bad Changes Pls ignore
Merge branch 'master' of https://github.com/Nberton/HUSTLE

Conflicts:
	manifest.json
	popup.js