initial commit
Merge branch 'master' of https://github.com/mohit22/MyTestSite

Conflicts:
	test1.txt