Test Commit
Merge branch 'master' of https://github.com/Nicolas-Miranda/TestRepo

Conflicts:
	README.md