Plaatjes
Controllers
jsp en REST
dynamische festivalpagina
gitignore
opruiming
artiest.jsp
Merge branch 'KalenderSetup' of https://github.com/utwente-di/di17 into KalenderSetup

Conflicts:
	Calendar/src/main/java/controller/RestController.java
artiesten toegevoegd
RestController fix
artiest query
artiest.jsp fix
festivalpagina af
naam is beter
Festival link artiestenpagina
fixje
Merge remote-tracking branch 'origin/KalenderSetup'

Conflicts:
	Calendar/.settings/org.eclipse.wst.common.component
	Calendar/.settings/org.eclipse.wst.common.project.facet.core.xml
	Calendar/src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/utwente-di/di17