No negative life
Merge branch 'player' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into player
Merge branch 'master' into player
Merge pull request #111 from GL-MPRI-2014/player

Player