Merge branch 'master' of https://github.com/karana1/NewRepo

Conflicts:
	README.md
l