Merge branch 'master' into testing

src/Dodge/Event/Keyboard.hs

@@ -11,6 +11,7 @@ import Dodge.LightSources
 import Dodge.LevelGen
 import Dodge.Creature.Inanimate
 import qualified Data.IntMap.Strict as IM
+import Dodge.Event.Test
 
 import SDL
 import Data.Maybe
@@ -55,9 +56,6 @@ spaceAction w = case listToMaybe $ _closeActiveObjects w of
     Just (Right but) -> _btEvent but but w
     Nothing -> w
 
-testEvent :: World -> World
-testEvent w = w
-
 pauseGame :: World -> World
 pauseGame w = w {_menuState = PauseMenu}