добавил вещей на страницу заказа
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/main/java/com/itechart/courses/controller/BasicController.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/src/main/webapp/script/controller/orderFlowers.js
	Server/src/main/java/com/itechart/courses/controller/BasicController.java
добавил вещей на страницу заказа
Merge remote-tracking branch 'origin/master'