modernized html+css structure, and controllers too
Merge branch 'master' of https://github.com/chesterlaw/blog

Conflicts:
	app/assets/stylesheets/w.css.scss
	app/views/w/index.html.haml