setting up the content columns
merge and fix conflict in scss
columnar layout (pre-responsive)
Merge branch 'feature/content-layout'