Renamed clock to clockTest to avoid merge conflicts
Merge branch 'master' of https://github.com/rykardo/TringDev
Ported Byron's clock over to new resizing framework