Fixed up GUI - Sort of Broken now, however
Merge branch 'master' of https://github.com/lilyc5459/cs3152