Merge code

Fix 404 bugs
Merge branch 'new-homepage' of github.com:Q42/q42.nl into new-homepage