Merge remote-tracking branch 'origin/Brian2' into Erik
Added timer system for player turns
Merge branch 'Erik'
Improved Start Screen

Do not merge into master yet
Updated Description
Updated Bug Report
removed a conflict
added displayed timer to game
fixed glitch with timer
fixed another glitch with the timer

(when sec < 10)
forgot to save prior to the last commit, saved
fixed a glitch with unit buying
made cities visible during unit movement
Unit combat created
hopefully ms gerstein doesn't break it again
Combat is actually functional for now
removed friendly fire

Michael Kelleher said it was "so much fun"
made the movement UI cooler
lowered start time, implemented city def buff
tweaked movement and unit stats