trash
Merge branch 'BTEST' of https://github.com/kennahasson/COGS120 into BTEST
fixed timer1