Sync
Merge branch 'master' of github.com:khannarishir/Test

Conflicts:
	abc.txt