checkboxes
Merge remote-tracking branch 'origin/master'

Conflicts:
	popup.html