Some styles on timers, slight timer template change
Merge branch 'master' of github.com:dsharps/pennapps2013f