commit2
commitaftermerge
commitAfterMerge2
commit5
Merge branch 'master' of https://github.com/abheekbose/gitDemo.git

Conflicts:
	test.txt