cc
2
4
5
Merge branch 'master' of github.com:rngmontoli/GitTest

Conflicts:
	README.md