St
Kill ring updates
ss
Merge branch 'master' of github.com:ignacy/.emacs.d

Conflicts:
	init.el