first commit
resolve readme.txt conflict