Adding some colors and more styling
Merging ghpages
Merge branch 'master' into gh-pages