pictures
Merge branch 'master' of https://github.com/SeminarioInvestigacion/Horizon-Suites

Conflicts:
	HorizonSuites/HorizonSuites.xcodeproj/project.pbxproj

HorizonSuites/HorizonSuites.xcodeproj/project.xcworkspace/xcuserdata/use
r3747.xcuserdatad/UserInterfaceState.xcuserstate
	HorizonSuites/HorizonSuites/en.lproj/MainStoryboard.storyboard
merges Pictures