merge necessary to pull new stuff
Merge branch 'master' of https://github.com/comp376/tower-of-darkness