master local changes
Merge branch 'master' of https://github.com/shyamkrishna/MyRepo

Conflicts:
	MyProject/Hi.txt