Menu
Merge ssh://rsync//data1/home/10076/fgits/awesome

Conflicts:
	.config/awesome/awesome.lua