some clearning up
Merge branch 'master' of github.com:MechanicalNun/Server-app