Fixed some errors in git, changed all pages to proper lay-out
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas
Merge branch 'Bas'
fixed git for the millionth time