file moving
update txt
fixed edit
Merge branch 'gh-pages'