Fixed server
Merge branch 'master' of github.com:BLauris/kartupelis