add functionW
Merge pull request #3 from kawase/feature_functionW

add functionW
add functionZ
Merge branch 'feature_functionZ' of github.com:kawase/git_test into feature_functionZ

Conflicts:
	test1