changed storyboard and stuffs
hopefully fixed merge
Merge branch 'master' of https://github.com/tomoueda/Picky