comm
Merge branch 'master' of github.com:zuzak/dotfiles

Conflicts:
	mplayer/config
	vim/vimrc