commit into dev
add note for learngit
change some notes
fix coflict in merging
modify the note by hank
fix conflict
remove the <<<< HEAD