add
add
delete
delete
modify .emacs file
add dict file
Merge branch 'localbranch'