GUI test update
Merge branch 'master' of github.com:DanielHopper/hwcd_hackwaterloo