Completed most of storyboard UI
Storyboard, VC changes
project file conflict resolved