dding line in the end on master to stop merge conflict
Merge branch 'master' of https://github.com/mailsbj001/git-test into testshivalocal
dding last line in testshiva to check merge conflicts
changed the last line on master
Merge branch 'master' of https://github.com/mailsbj001/git-test into testshivalocal

Conflicts:
	README.md