up
Merge branch 'master' of https://github.com/miso231/PA165-CarPark

Conflicts:
	CarParkApp/derby.log

	CarParkApp/target/surefire-reports/TEST-cz.muni.pa165.carparkapp.DAO.EmployeeDaoImplTest.xml

	CarParkApp/target/surefire-reports/cz.muni.pa165.carparkapp.DAO.EmployeeDaoImplTest.txt