Added a game timer and end game popup
Merge branch 'master' of github.com:DimitarUzunov/conquer-fmi