setting jekyll
Merge branch 'master' of github.com:tikider/tikider.github.com

resulving conflicts