conflicts resolution

conflicts resolution
build commits

build commits
Merge branch 'master' of https://github.com/skhan18/Providence

Conflicts:

DownTownLATabbar.xcodeproj/project.xcworkspace/xcuserdata/awais.xcuserda
tad/UserInterfaceState.xcuserstate

DownTownLATabbar.xcodeproj/project.xcworkspace/xcuserdata/sehrish.xcuser
datad/UserInterfaceState.xcuserstate
commit

commit