changed width to % in #container
Merge branch 'master' into gh-pages

Conflicts:
	css/application.css
fixed merging in #container
Merge branch 'gh-pages'