Removed random emacs auto-save file from git tracking
Merge branch 'master' of github.com:bkrieger/fruity