server v2
Merge branch 'master' of https://github.com/przemoa/projekt