removed conflict
Merge branch 'master' of https://github.com/newstrition/newstrition

Conflicts:
	newstrition/js/popup.js
Merge branch 'master' of https://github.com/newstrition/newstrition