In-between commit
In-between commit
Merge branch 'design' of https://github.com/utwente-di/di04.git into design
Mooiïfied AddGroep en EditSchool en css changes
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
In-between commit
In-between commit
Mooiïfied AddGroep en EditSchool en css changes
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