Adding in the features we can't test at the moment and working on the new files.
Merge branch 'master' of github.com:ZackC/Senior-Design-Lego-Lab