Updated GUI
Merge branch 'master' of https://github.com/mattschwartz/asg2

Merging work together.