Merge pull request #2 from CalZoneVUB/master

Reverse pull request
Merge pull request #3 from CalZoneVUB/master

Reverse pull request
Home pagina versie 1 (vertical box)
Merge pull request #51 from gaethofs/master

Homepage versie 1
Room
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev