hide navbar
fghjh
vvbn

bnmbnm
Merge branch 'brunoBranch' into alvaroBranch

Conflicts:

TBInvestigacion.xcodeproj/project.xcworkspace/xcuserdata/bruno.xcuserdat
ad/UserInterfaceState.xcuserstate
Merge branch 'alvaroBranch' of https://github.com/serbru20066/TBInvestigacion into alvaroBranch