Merge branch 'gh-pages'
changed skills bar
Merge branch 'master' into gh-pages