modified:   Web-Ui/README.md
Merge https://github.com/kafudz/My-Config

Conflicts:
	Web-Ui/README.md

	modified:   Web-Ui/README.md
	modified:   dotfiles/.xinitrc