Merge branch 'master' into gh-pages
width
header
Merge branch 'master' into gh-pages

Conflicts:
	js/main2.js
Merge branch 'gh-pages'
header and width
Merge branch 'gh-pages'
updated