modified
Merge branch 'master' of https://github.com/faijurrahman/test

Conflicts:
	test2.txt