Merge branch 'master' of https://github.com/IulianaPopa/training.git
Merge branch 'master' of https://github.com/IulianaPopa/training.git
Merge branch 'master' of https://github.com/IulianaPopa/training.git

Conflicts:
	src/test/java/com/CreateVacationTest.java