added comments
this should create a merge conflict
this should create a merge conflict
Merge branch 'test1'

Conflicts:
	README.md