I added my name
Merge remote-tracking branch 'origin' into hBranch

Conflicts:
	README.md
I added my name
added my name