obaid changes
Merge branch 'master' of github.com:osiddiqui/TestRepository

Conflicts:
	newfile.txt
manual cleanup