test merge conflict
Merge remote-tracking branch 'origin/CleanCode' into CleanCode
hehe
hehe
hehe
Merge remote-tracking branch 'origin/CleanCode' into CleanCode

Conflicts:
	README.md
clean README.md
modified readme
clean README.md