number pad
Merge branch 'master' of https://github.com/Yudais/CardCorrection

Conflicts:
	CardCorrection/Base.lproj/Main.storyboard
	CardCorrection/DetailViewController.h
	CardCorrection/myDetailViewController.h
	CardCorrection/myViewController.h