initial commit(NEIN NEIN NEIN)
this is a commit
ramon is er klaar mee! slaap lekker branch
stuff
someone stole ma ActivityExecutions.java :@
Merge remote-tracking branch 'origin/groepsexecutie'

Conflicts:
	kunstmenu/src/main/java/nl/utwente/di04/SearchEngine.java
	kunstmenu/src/main/webapp/SimpleSearch.jsp
	kunstmenu/src/main/webapp/backoffice/ReservationsPerActivity.jsp
	kunstmenu/src/main/webapp/backoffice/ReservationsPerPrimarySchool.jsp