styling final
Merge branch 'develop' into gh-pages
compiled css