merge
add categories, navigation controller
commit before merge
Merge branch 'master' of github.com:Melancholic/Some-Store