Emacs Learning: grep in emacs
Learned some git
Merge remote-tracking branch 'origin/master'