Merge pull request #1 from m-e-h/master

master to dev
remove .grid class from #content

also align class names with _s
comment out the space between content and sidebar

This is so we can use inline block without the added margin.
Merge pull request #2 from m-e-h/dev

Dev