hanges in test
Merge branch 'master' of https://github.com/thebillkidy/KdG_IAO301A

Conflicts:
	Databanken & Middleware/Examen/Java/.idea/workspace.xml
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Artiest.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Bezoeker.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Festival.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/FestivalDag.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Medewerker.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Optreden.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Playlist.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Song.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Taak.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Ticket.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/TicketOrder.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Tracking.class
	Databanken & Middleware/Examen/Java/out/production/Examen/com/desple/model/Zone.class
	Databanken & Middleware/Examen/Java/out/production/Examen/hibernate.cfg.xml
Merge branch 'master' of https://github.com/thebillkidy/KdG_IAO301A

Conflicts:
	Databanken & Middleware/Examen/Java/Examen.iml
	Databanken & Middleware/Examen/Java/out/production/Examen/hibernate.cfg.xml
added gitignore