merge

diff --cc naja/engine.py
Simple merge

diff --cc naja/scenes/menu.py
index a72beff4dd25dceee62a291c005d6654a4bf73fc,a13abcf568d6c90bd9fdc3cfdab467e5c26b62d9..b17f611234253b5ad9b69f1aacd1aebcf34eb5d9
--- 1/naja/scenes/menu.py
--- 2/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@@ -14,10 -13,8 +14,11 @@@ class MenuScene(Scene)
  
      def __init__(self):
          super(MenuScene, self).__init__()
+         self.widgets.append(TextWidget((10, 10), 'Haai', fontsize=32,
 +        self.widgets.append(TextWidget((10, 10), 'Naja',
                              colour=(255, 255, 255)))
 +        self.credits_menu = CreditsScene()
 +        self.credits_menu.set_base_menu(self)
  
      def handle_event(self, ev):
          if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):