Committing jekyll
Merge branch 'full'

Conflicts:
	feed.xml
	index.html