new change
add .emacs
Merge branch 'master' of https://github.com/sycheng/rcfiles

Conflicts:
	bashrc