More changes to webserver(not done yet)
Merge branch 'master' of https://github.com/eudyptula/Encourage