modify emacs
Merge branch 'master' of https://github.com/ray-chu/config-files
resolve conflicts
Conflicts:
	emacs
	emacs~