commit3
Merge branch 'master' of https://github.com/ankurwcities/test

Conflicts:
	test.txt.txt

Conflict resolved