One day's worth of code
Merge branch 'master' of github.com:Ferdi265/ppplz-server