Modified storyboard
Added controllers
Added base model
Merge branch 'model'
Master merge fix