did some changes
merge conflict
tonen van projectnaam op whiteboard met php
merge fix