resolved issues
resolved conflict
Merge branch 'gh-pages' of github.com:designfundi/jekyll into gh-pages