Update the README
Merge branch 'master' of https://github.com/dpavic/git-real
Update Readme to have conflict
Merge branch 'master' of https://github.com/dpavic/git-real

Conflicts:
	README.txt