Step one of guard integration.
Incorporated stun and game over.
Merge branch 'master' into zhandev