Update .gitignore file
Merge remote-tracking branch 'github/master'
Added *~ to .gitignore to ignore emacs backup files.