Merge remote-tracking branch 'origin/jurriaan' into Bastiaan
Add homework, detail,
Merge remote-tracking branch 'origin/Bastiaan' into jurriaan
functions - homework - storyboard