commit pøed uloením na bitbucket
	modified:   readme2.txt
Merge https://github.com/ricvr/test

Conflicts:
	readme2.txt
Konflikt mezi verzi v repozitari a u mì na lokale