r
Merge branch 'master' of github.com:rngmontoli/GitTest

Conflicts:
	README.md
f
Merge branch 'master' into t52

Conflicts:
	README.md