fthj
Merge branch 'master' of https://github.com/sapphire-boy/gittest

Conflicts:
	README.md