SLAAN
Merge branch 'master' of https://github.com/NetjerDjehuty/INFOMGP

Conflicts:
	src/Scene.h