Be bold and move views around a bit
Merge branch 'master' of https://github.com/dodgio/StoryboardTester1