Update .gitignore

	modified:   org-mode (modified content)
Update .gitignore
Edit README.md
Merge branch 'master' of https://github.com/XiaoA/.emacs.d