Lab5.c
lab5.c fixed merge conflicts
Merge branch 'master' of https://github.com/jrife/rtos
os.c: restored global timer functions to working