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

Conflicts:
	README
Revert ba9c59f..b0dc67c

This rolls back to commit ba9c59f24b32b2606185b7a17a784e53c01ea0bd.
Merge branch 'master' into dummy2-2

Conflicts:
	README