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

Conflicts:
	haiku-KonradGora.txt
Merge branch 'master' of github.com:JavaHive/haiku