first commit
Merge branch 'master' of https://github.com/michalv/test4

Conflicts:
	README.md
f
Merge branch 'master' of https://github.com/michalv/test4

Conflicts:
	README.md