Add emacs backup files to .gitignore
Envelope with proper duration
Merge branch 'newbranch', remote-tracking branch 'origin'
Better Envelope