style
Merge remote-tracking branch 'origin/master'

Conflicts:
	404.html
	LICENSE.html
	about.html
	blog.html
	index.html
	lab.html