More design.
Merge branch 'master' of https://github.com/Stringsy/team-project