sizing issues fixed
Merge branch 'master' of https://github.com/jessmand/Enough
progress bar
fixed bugs
resolved conflict