comments designs
fixes conflicts
Merge branch 'master' of github.com:TheyShouldHaveATeam/TheyShouldHaveThis