Modified css style sheet to add skills in each job
misc.
fixed merge conflict
added remarks
Merge branch 'master' into gh-pages