Merge branch 'master' of https://github.com/Doggydoggy/iOS

Conflicts:
	PetFlickerWithStoryBoard.xcodeproj/project.pbxproj
	PetFlickerWithStoryBoard/Base.lproj/Main.storyboard