Footer weg, noconflict weg!!!

lossen we in sprint 3 op!!
Merge remote-tracking branch 'origin/Sprint-2'