change pickerview
Merge branch 'master' of https://github.com/Idabkf/miapp

Conflicts:
	.DS_Store
	testmi/.DS_Store
	testmi/testmi.xcodeproj/project.pbxproj

testmi/testmi.xcodeproj/project.xcworkspace/xcuserdata/Sandra.xcuserdata
d/UserInterfaceState.xcuserstate

testmi/testmi.xcodeproj/xcuserdata/Sandra.xcuserdatad/xcdebugger/Breakpo
ints.xcbkptlist

testmi/testmi.xcodeproj/xcuserdata/Sandra.xcuserdatad/xcschemes/testmi.x
cscheme

testmi/testmi.xcodeproj/xcuserdata/Sandra.xcuserdatad/xcschemes/xcscheme
management.plist
	testmi/testmi/PageViewController.m
	testmi/testmi/ViewController1.m
	testmi/testmi/ViewController2.h
	testmi/testmi/ViewController2.m
	testmi/testmi/en.lproj/MainStoryboard.storyboard
	testmi/testmi/en.lproj/PageViewController.h
pem