With Reggie. Worked on going back to main menu on death.
Merge branch 'PingPong' of github.com:gametechnology/psi-2013 into PingPong
Merge branch 'PingPong' into origin_PingPong
Small commit containing nothing.