test
Merge branch 'gh-pages' of https://github.com/Jnoee/blog.git into
gh-pages

Conflicts:
	_layouts/default.html
test