ed
Merge branch 'master' of https://github.com/mony960/dotfiles

Conflicts:
	.config/awesome/wi.lua