add 121212
readme.txt
merge & fix readme.txt