Ignore emacs auto saves
Initial commit
Resolve merge