User1 Changed the file
Merge branch 'master' of https://github.com/iOSRaj/GitStart

Conflicts:
	sample.rtf
Conflicts resolved