:P
.
Merge branch 'branch_adina' of https://github.com/clausoftware/Corso.git into branch_claudiu

Conflicts:
	src/orders/Product.java