Merge pull request #8 from OrangeJam/kari

Tabbar controller