Merge 2
Merge branch 'master' of https://github.com/Iankodj/TestGit

Conflicts:
	README.md