Merge branch 'dummy2-1'
Merge branch 'master' of https://github.com/mito829/helloworld

Conflicts:
	README