Merge branch 'model' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into dev-gradle
Merge branch 'dev-gradle' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into dev-gradle