Helpful comment
Comment
Merge remote-tracking branch 'origin/master' into 220-menuaccessability

Conflicts:
	sass/cottage.scss