Server is now (hopefully) working
Merge branch 'master' of https://github.com/georgimanov/Team--TULIP-PINK-