Restructured content model and restrained site width on hi res
Merge branch 'gh-pages' of https://github.com/cornae/makombeh into gh-pages

Conflicts:
	index.html