123
Merge branch 'master' of https://github.com/amit242/MedShop

Conflicts:
	Project/test1 - Copy.txt