merge conflict
Merge branch 'master' of https://github.com/zachlite/Junior-Design
fixed ir timing bug with delay.  need to investigate uart flags