Commit by Paras
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo.rtf
Merge Test