version 4
Merge branch 'master' of github.com:chudanwang/asic_decoder

Conflicts:
	README.md