test 3 conflict test
changes by me offline
Merge branch 'master' of https://github.com/clmathuriya/test3

Conflicts:
	README.md