2LINIA
Merge branch 'master' of github.com:JavaHive/haiku
Merge branch 'master' of github.com:JavaHive/haiku

Conflicts:
	haiku-ĹukaszSkĂłrski.txt
Merge branch 'master' of github.com:JavaHive/haiku