added dummy1
Merge branch 'dummy1'

Conflicts:
	README