Merged storyboard and settings conflicts #225

Closed majickdave closed 7 years ago