fix bad merge storyboard issue
Merge pull request #53 from cameronklein/Cameron

fix bad merge storyboard issue