added simple player controller (Dead/Alive)
merge, everybody merge