a
Merge branch 'gh-pages' of github.com:lavende/Jekyll into gh-pages
merge