screenrc
Merge branch 'master' of github.com:chenfengyuan/dotfiles
gpg
Merge branch 'master' into gensym-ilisp
alias tar
fix free variables bug
set default browser to opera
alias ls
alias e
remove face-recognition.org
adjust some configuration for gensym-ilisp
powerline
Merge commit '3726149'

Conflicts:
	emacs
	zshrc