init
initial shift to jekyll complete
Merge branch 'master' into jekyll