cleaned up some files, modified GUI to fix some bugs
Merge branch 'master' of https://github.com/bsanders/softeng