Gregg change
Merge branch 'master' of https://github.com/shtorm3d/git-real

Conflicts:
	readme.txt