add emacs version check in .emacs
Merge branch 'master' of github.com:ender-wan/ender-config

Conflicts:
	.emacs