Merge branch 'de'
Merge branch 'master' of https://github.com/jacob-hegna/Shauna-game
Merge branch 'master' into de