moje
Merge branch 'master' of https://test15411@github.com/test15411/gittest.git
local
Merge branch 'master' of
https://test15411@github.com/test15411/gittest.git

Conflicts:
	redme.txt