middle commit, merging
Merge branch 'master' of https://github.com/ctag/uah
still working on lab12, timerA is messed up