remove linux face
Merge branch 'master' of github.com:lilu/my-emacs

Conflicts:
	init.el