fixed commit
Merge branch 'develop'
Merge branch 'release/1.0'

Conflicts:
	test.xcodeproj/project.xcworkspace/xcuserdata/worawitnawaritloha.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/princesuke/testXcode into feature/test02
Homework 2 return textField