added dummy2-2
Merge branch 'master' into dummy2-2

Conflicts:
	README
Merge branch 'dummy2-2'