update copyright info
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	style/main.css

merge from master