Styling
Merge branch 'gulp-compiling' into gh-pages