uploading over code with ornella computer
Merge branch 'master' of https://github.com/KetchupMoose/petGallerycode

Conflicts:
	.DS_Store
	petGallery.xcodeproj/project.pbxproj
	petGallery/en.lproj/MainStoryboard.storyboard