fix6
Merge branch 'master' of github.com:jandi02/testgit2

Conflicts:
	README.md