And here it is
Merge branch 'master' of https://github.com/Alientology/jblog

Conflicts:
	articles/hello.html
	index.html