new design
merged local changes
Merge branch 'master' of https://github.com/wwagner4/shuck
Merge branch 'master' of https://github.com/wwagner4/shuck
gui refactoring