w
COMMIT
Merge branch 'master' of https://github.com/kicoo7/Seminarska

Conflicts:
	src/main/java/daoImpl/TripDaoImpl.java