Design changes
Merge conflicts
Merge branch 'master' of github.com:Gi11i4m/Scrumbags