.
Merge branch 'master' of https://github.com/diegojonio/ProjetoTreino

Conflicts:

ProjetoTreino.xcodeproj/project.xcworkspace/xcuserdata/pos.xcuserdatad/U
serInterfaceState.xcuserstate