Greg commit
Merge branch 'master' of https://github.com/Nocktu/git

Conflicts:
	README.txt