Starting to work on tab bar controller
Merge remote-tracking branch 'origin'