This branch implements:
issue 60,
issue 68 though being merged with the issue68 branch,
issue 5 because it is connected to issue 60,
and fixes the bug where calibration screen doesn't appear onto after first calibration.
I've tested this with both trackers since issue59 was merged with master. I believe it is ready to be merged. I'll will merge this issue Friday during or after our meeting unless someone has an issue.
This branch implements: issue 60, issue 68 though being merged with the issue68 branch, issue 5 because it is connected to issue 60, and fixes the bug where calibration screen doesn't appear onto after first calibration.