Merge remote-tracking branch 'upstream/master'

Conflicts:
	css/style.css
	index.html