user1 changes
Resolved conflict
Merge branch 'master' of https://github.com/sdharwada/learnGit

Conflicts:
	README.md