Merge branch 'master' of https://github.com/nostradalmine/nostradalmine.it

Conflicts:
	README.md
Update README.md