整理storyboard，尝试进入后在appDelegate跳转界面失败
Merge remote-tracking branch 'origin/master'