First commit
Merge branch 'master' of github.com:nfroidure/blog

Conflicts:
	.gitignore
	LICENCE