i don't know) Merge remote-tracking branch 'qfac3/versionw'
added test to README.md
test conflict
Merge branch 'develop'

Conflicts:
	README.md
qwerqwer
qwer
asdfa
add Testgit php to master
Merge branch 'master' of https://github.com/wolodymyr/versionm