Merge pull request #35 from katiewood/master

Implement timer display
implement score display