up
Merge branch 'master' of https://github.com/wuzongbin2008/ori_ec_test

Conflicts:
	ori_encoder/bin/Debug/ori_encoder
add file