Resolving storyboard conflicts

Storyboard conflicts
Merge pull request #9 from chrisfsampaio/master

Resolving storyboard conflicts