Playing with hilitor
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/popup.html
	app/scripts/popup.js
Merge remote-tracking branch 'origin/master'