merge with no-ff
add lear.html
dele file
add log.txt
tody add log.txt
add log
add dev file
AND simple