Added emacs autosave files to .gitignore
Merge branch 'ZhuangLab-master'
Handled merge conflict with .gitignore