conflict solved
....
...
Merge branch 'master' of https://github.com/elmagomamer/codeRepo.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/elmagomamer/codeRepo.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/elmagomamer/codeRepo.git
Merge branch 'master' of https://github.com/elmagomamer/codeRepo.git
local change
local comit
resolved conflict
Merge branch 'master' of https://github.com/elmagomamer/codeRepo.git

Conflicts:
	README.md