Added in seconds and minutes, implemented TMR1 functionality
Merge branch 'Paul' of https://github.com/kevincmorris/Lab1 into Nico