Revert to working commit (commit e6ca6efe3ee4357b56fcf1c693d941701565dd27)
Merge branch 'Iteration-1-dev-GUI' of github.com:alexbragdon/wpi-suite into Iteration-1-dev-GUI