second change
Merge branch 'master' of https://github.com/rywd/HelloWorld

Conflicts:
	note.txt