Update readme
Merge branch 'master' of github.com:Efemer/git_real

Conflicts:
	readme.txt