update readme.txt by project1
Resolve conflict in project1
update readme.txt by project2
add readme.txt by project1