Nieuwe versie

Had deze nog liggen
festival afbeeldingen
Merge branch 'master' of https://github.com/utwente-di/di17
festival afbeeldingen 2
.gitignore update
Updated HTML

New design {dynamic.css}
Merge remote-tracking branch 'origin/KalenderSetup'

Conflicts:
	Calendar/src/main/java/controller/CalendarController.java
	Calendar/src/main/java/controller/RestController.java
	Calendar/src/main/webapp/festival.jsp
	Mock-ups/Mock-up/Artist.html
	Mock-ups/Mock-up/Upload.html
	design/schema.sql
merge fix
New HTML

yay
nieuwe festivalpagina layout
festifix
ASCII :D
error pagina
classpath
Sprint retrospective

SR sprint 2 update
SR sprint 3 new
Merge branch 'master' of https://github.com/utwente-di/di17

Conflicts:
	meetings/Sprint review 2/SprintRetrospective21052014.docx
aangepaste SQL schema
SQL diagram update
Sprintretrospective verbeterd
Merge remote-tracking branch 'origin/master' into KalenderSetup