readme
Merge branch 'master' of github.com:viktory/testgit

Conflicts:
	README.md