fix
Merge branch 'master' of https://github.com/Alexnagel/webserver
Settings working