asd
Merge branch 'master' of github.com:hm3shah/Market-Buddy

Conflicts:
	New Test_doc.docx