removed tab bar controller
merge from challenge branch
Merge remote-tracking branch 'origin/master'
merge from challenge branch