Collision with explosions
Merge remote-tracking branch 'origin/master'

* origin/master:
  Adjusting base graphic
  Socket communication
  Added controller.css and some controller graphics