first commit
prepare publishing on github
Merge commit '4017a6c'

Conflicts:
	README.md