fun25
Merge branch 'master' of https://github.com/novotnym/GitTestRepoHub

Conflicts:
	GitTest/src/cz/test/gitTest.java