Fix for endGame
Merge branch 'EG_GameFront' of https://github.com/eugene195/tp_2014_09_java into EG_GameFront