a bit of conclusion
Merge branch 'gh-pages' of github.com:jellea/thesis into gh-pages
puntjes op de i