Nieuwe versie

Had deze nog liggen
festival afbeeldingen
festival afbeeldingen 2
updateje
Artiest afbeeldingen toegevoegd
afbeeldingen init
filter method
Merge branch 'KalenderSetup' of https://github.com/utwente-di/di17 into KalenderSetup

Conflicts:
	Calendar/src/main/java/controller/CalendarController.java
merge fix
alfabet
knoppen filter
Database connectie beveiligd
Merge branch 'KalenderSetup' of https://github.com/utwente-di/di17 into KalenderSetup

Conflicts:
	Calendar/src/main/webapp/index.jsp
.gitignore update
van alles
Merge branch 'KalenderSetup' of https://github.com/utwente-di/di17 into KalenderSetup

Conflicts:
	Calendar/src/main/webapp/index.jsp
merge fix
Merge branch 'KalenderSetup' of https://github.com/utwente-di/di17 into KalenderSetup

Conflicts:
	Calendar/src/main/webapp/index.jsp
n
we did it :D