Small changes that I can't remember
Fixing merge conflicts
Merge issues with local copies
Merge branch 'rev2_documentation' of github.com:cs3733-team4/wpi-suite into rev2_documentation