test2
Merge branch 'master' of https://github.com/ericzju/helloworld

Conflicts:
	wf/test