simple changes
Merge branch 'master' of github.com:nplaster/csci443
Merge branch 'master' of github.com:nplaster/csci443
gui and code sometimes works