da.cheng
fix conflict
update manifest
Merge pull request #24 from topalps/master

da.cheng