Merge branch 'master' of https://github.com/BenBarahona/GIVIT-PROYECT

Conflicts:
GiveItMobile.xcodeproj/project.pbxproj
GiveItMobile/GiveItMobile-Info.plist