primer commit

primer commit
hj

ghjhj
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
qwe

wqe
logueo con nav

logueo con nav
ptm

ptm
qrwq

wr
conectado y navBar hidden
Merge branch 'alvaroBranch' into brunoBranch

Conflicts:

TBInvestigacion.xcodeproj/project.xcworkspace/xcuserdata/bruno.xcuserdat
ad/UserInterfaceState.xcuserstate