readme.md
...
Merge branch 'master' of https://github.com/MichelValentin/gphelper

Conflicts:
	README.md