Storyboard and Controller/Model Initialize
Merge remote-tracking branch 'origin/master'
committing because Xcode is stupid.
Merge remote-tracking branch 'origin/master'
syncing