width of container
Merge branch 'master' of github.com:petethedude/wintersmith-blog

Conflicts:
	contents/css/main.css
design changes