test conflict
Merge branch 'master' of https://github.com/tazinger/dummy

Conflicts:
	readme.txt