Merge branch 'master' of https://github.com/juliendb/demogit2

Conflicts:
	README.md
resolve conflit read file