mashehu
masheu
fff
Merge branch 'master' of https://github.com/danpilew/Ex3.oop.git

Conflicts:
	ex3/src/test.java