Zoek en sorteer balkje
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/css/style.css
	src/main/webapp/partials/home.html
Merge branch 'master' of https://github.com/utwente-di/di06

Conflicts:
	src/main/webapp/partials/home.html
Merge branch 'master' of https://github.com/utwente-di/di06

Conflicts:
	src/main/webapp/partials/home.html