more gui bug fixes
Merge branch 'master' of https://github.com/bsanders/softeng
pre-merge commit
Merge branch 'master' of https://github.com/bsanders/softeng
final bug fies
Merge branch 'master' of https://github.com/bsanders/softeng