Merge branch 'master' of https://github.com/jacob-hegna/Shauna-game
Merge branch 'master' into de
I have no life. Definitions are filled D:
	modified:   media/vocab.json
I did some stuff, I don't actually remember... In other news, I'm moving back to de now...
	renamed:    liscensing/LICENSE.FLAC.txt -> licensing/LICENSE.FLAC.txt
	renamed:    liscensing/LICENSE.freetype.txt -> licensing/LICENSE.freetype.txt
	renamed:    liscensing/LICENSE.jpeg.txt -> licensing/LICENSE.jpeg.txt
	renamed:    liscensing/LICENSE.mikmod.txt -> licensing/LICENSE.mikmod.txt
	renamed:    liscensing/LICENSE.modplug.txt -> licensing/LICENSE.modplug.txt
	renamed:    liscensing/LICENSE.ogg-vorbis.txt -> licensing/LICENSE.ogg-vorbis.txt
	renamed:    liscensing/LICENSE.png.txt -> licensing/LICENSE.png.txt
	renamed:    liscensing/LICENSE.smpeg.txt -> licensing/LICENSE.smpeg.txt
	renamed:    liscensing/LICENSE.tiff.txt -> licensing/LICENSE.tiff.txt
	renamed:    liscensing/LICENSE.webp.txt -> licensing/LICENSE.webp.txt
	renamed:    liscensing/LICENSE.zlib.txt -> licensing/LICENSE.zlib.txt
	modified:   media/vocab.json
	modified:   src/states/gameplay/gameplay.cpp