Minor changes
Some changes
Emacs configuration
Merging changes