merge with no-ff
fix bug 101
merged bug fix 101
add ignore list
Change readme.txt
Merge branch 'master' into dev