width
header
Merge branch 'master' into gh-pages

Conflicts:
	js/main2.js
header and width