ok, I've made the code from that branch ready to merge: https://github.com/sepm-depm/sepm-group/pull/19

this should make the server much cleaner and simpler and get it ready in time for tomorrow.