Merge branch 'master' of https://github.com/TuanMTruong/Senior_Design

Conflicts:
Documentations/Features-Garrett.xlsx