Fix Server
Merge branch 'master' of https://github.com/j-bischof/Smart-Calculator