commit
qwe
Merge branch 'master' of https://github.com/JoaoSisanoski/Projeto-iOs

Conflicts:

LightNDark/LightNDark.xcodeproj/project.xcworkspace/xcshareddata/LightND
ark.xccheckout
asd