New Design
Merge remote-tracking branch 'origin/master'

Conflicts:
	popup.html
	style.css
Design New