add new file to dev
meger error
change readme.txt
readme fixed
add meger.txt file
meger with no-ff
fix bug 101
git merge bug 101
change meger.txt
fix dev