initial commit(NEIN NEIN NEIN)
this is a commit
ramon is er klaar mee! slaap lekker branch
stuff
someone stole ma ActivityExecutions.java :@
AddActivity
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
Done for merge with remove group groupoverview and link from index.jsp
Merge remote-tracking branch 'origin/DeleteGroup'
Add search improvement
Merge branch 'master' of https://github.com/utwente-di/di04.git
RemovePrimarySchoolServlet
In-between commit
In-between commit
Mooiïfied AddGroep en EditSchool en css changes
Merge branch 'design' of https://github.com/utwente-di/di04.git into
design

Conflicts:
	kunstmenu/src/main/webapp/index.jsp