Properly name scenes
Timer w/ color
Merge pull request #1 from jfarmer/master

timer!