Fixed typo in inline comments.
Merge branch 'upstream'

Conflicts:
	style.css