joeri zijn handje vasthouden :saxophone: :hamster: :racehorse: :racehorse: :racehorse:
Merge remote-tracking branch 'origin/master'

Conflicts:
	werkende versie
workspace/flatportal-final/src/main/webapp/huispagina.jsp
Merge branch 'master' of https://github.com/utwente-di/di02