commit
Merge branch 'master' of https://github.com/riccardoL/sample_blog

Conflicts:
	README.md