Conflict merge
Merge github.com:satyadash/GitDemoProject

Conflicts:
	MyCode/hi.txt