Private commit
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
simons crash fix