commit from New folder
Merge branch 'master' of https://github.com/amitbitcse/mygitrepo

Conflicts:
	1.txt