Trying to fix server crash
Merge branches 'master' and 'master' of github.com:TTK4145-Project/TTK4145-Project