Changed nonsense setence in About and added emacs files to .gitignore
Fixed merge conflict