j

nisr
Merge branch 'master' of https://github.com/diegosky1/micondominio

Conflicts:

loadingscreen2/loadingscreen2.xcodeproj/project.xcworkspace/xcshareddata
/loadingscreen2.xccheckout