fix feu qui tue
Merge branch 'master' of github.com:kelthalas/gamechallenge2014-9