Merge branch 'master' of https://github.com/simon-previdente/blog

Conflicts:
	Makefile
Merge branch 'master' of https://github.com/simon-previdente/blog

Conflicts:
	Makefile