conflict test
Merge branch 'master' of http://github.com/oyo/ean1k

Conflicts:
	readme.txt