small change move people+move player
Merge branch 'master' of https://github.com/jorgeer/dontpanic.git
Merge branch 'master' of https://github.com/jorgeer/dontpanic.git
Merge branch 'master' of https://github.com/jorgeer/dontpanic.git
some bugs+merge