mpd
before merge
Try to understand how to resolve conflicts in cli

Conflicts:
	.zshrc
	awesome/rc.lua
YankRing