Merge branch 'master' of https://github.com/sontl/IdealPad

Conflicts:
	.DS_Store
	IdealPad.xcodeproj/project.pbxproj
	IdealPad/.DS_Store
	IdealPad/SignatureControllerViewController.m
	IdealPad/en.lproj/MainStoryboard.storyboard
test2
a

a
test

test
test4

test4