fixing merge error
config
Merge branch 'master' of https://github.com/ronreiter/webserverlab