LabSessen11
Merge remote-tracking branch 'upstream/master'

Conflicts:
	EDAPractice.iml
	bin/part1/Product.class
	bin/part1/Shop.class
	bin/part1/ShoppingCenter.class
	bin/part1/Test.class
	src/part1/Card.java
	src/part1/Catalogue.java
	src/part1/CenterEmployee.java
	src/part1/Cloth.java
	src/part1/Customer.java
	src/part1/Employee.java
	src/part1/Person.java
	src/part1/Product.java
	src/part1/ProductType.java
	src/part1/Shop.java
	src/part1/ShoppingCenter.java
	src/part1/Test.java