tidying up for demo
Merge branch 'master' of https://github.com/JohanPeeters/secure-webserver