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

Conflicts:
	README.md