Added code for Issue #14
Merge conflict resolved.
Merge conflict resolved.
Merge nhandler and Kyle code for health/game over