Changed colors and fixed reset button
Merge branch 'master' of github.com:purduerov/BattleStation
renabled timer