Merge branches 'cleaning' and 'balancing'

	modified:   ld40.js

diff --cc ld40.js
index 7b14c05b870e51ba841e4ff0a0feb9d25c09fae8,892e1b1d62239d0ec497f90ce9ad7b69bee19f2f..f7954c2a7d4a0ae5239f12a0094744b2cafe8b7b
--- 1/ld40.js
--- 2/ld40.js
+++ b/ld40.js
@@@ -44,10 -43,9 +44,10 @@@
                  this.lasttime_shoot = 0;
                  this.lasttime_mode = 0;
                  this.lasttime_damage = 0;
-                 this.speed = 150;
+                 this.speed = SPEED_PLAYER;
                  this.switchmode(MODE_DETERMINATION);
 -                this.projectiles = game.add.group();
 +                this.weapon = new JusticeBlaster(game, this);
 +                this.weapon.bulletSpeed = SPEED_PPROJECTILE;
                  this.healthBar = new HealthBar(60, game.world.height - (WALL_BORDERBOTTOM / 2));
              }