OMG
Merge branch 'master' of https://github.com/Buldofr/MiniProjetPOO

Conflicts:
	src/Test.java

merge