made minor changes to storyboard
Merge branch 'Marion'
merging with master