first
Merge branch 'master' of github.com:luoxing91/home

Conflicts:
	.emacs

	new file:   .bash_profile
	new file:   .bashrc
	modified:   .emacs
	new file:   sbcl.core-with-swank