add tabbarcontroller % add picture
again
Merge branch 'working-2'