add merge
fix bug 101
Add new.txt
Merge dev