update
Merge branch 'master' of github.com:antekone/emacsrc

Conflicts:
	.emacs