Update .gitignore

emacs junk
adding a conflicting change
changing lecture
merging HEAD with current branch