First commit
Merge branch 'master' of https://github.com/marianoviola/diallog

Conflicts:
	README.md