Added Menno in Server
Merge branch 'master' into gh-pages
Added Dieuwertje