Honestly can't remember. Did something with the sound.c i think.
Merge
Added: Initial version of dungeon generator
Fixed: Re-added code in gameloop due to git auto-merge fail..
Fixed: Added newline to game.c