wip
fixed merge conflict
remove storyboard
Merge branch 'master' of https://github.com/nlauer/Nano