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

Conflicts:
	CarParkApp/derby.log

	CarParkApp/target/classes/cz/muni/pa165/carparkapp/DAO/BranchDAOImpl.class
	CarParkApp/target/classes/cz/muni/pa165/carparkapp/DAO/CarDAOImpl.class

	CarParkApp/target/classes/cz/muni/pa165/carparkapp/DAO/EmployeeDaoImpl.class

	CarParkApp/target/classes/cz/muni/pa165/carparkapp/DAO/LoanDAOImpl.class
	CarParkApp/target/classes/cz/muni/pa165/carparkapp/Main.class

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

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

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

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

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

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

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

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

	CarParkApp/target/test-classes/cz/muni/pa165/carparkapp/DAO/EmployeeDaoImplTest.class
	Thumbs.db