first commit
second commit
java commit
Merge branch 'master' of https://github.com/zip-cloud/jbarbuletis
Merge branch 'master' of https://github.com/JBarbuletis/IO-projekt

Conflicts:
	README.md