Create project
Merge branch 'master' of https://github.com/irinalishchuk/FFP-Project

Conflicts:
	src/AlcoChildException.java
	src/Dish.java
	src/TestClass.java
	src/User.java