Also worked
Merge branch 'master' of https://github.com/aeckert87/gittest

Conflicts:
	readme.txt