Updating content layout
Merge branch 'master' into gh-pages
testing styles
Updating content layout
Merge branch 'master' into gh-pages
Still needs a little work, but is ok