pre-merge commit
pre-merge commit
Merge branch 'master' of https://github.com/bsanders/softeng
Merge branch 'master' of https://github.com/bsanders/softeng
cleaned up code fixed some theme stuff cleaned gui removed certain error messages