Challenges 1 & 2 server-side
Merge branch 'master' of github.com:kamilogorek/dev-null-x-team