hz
Merge branch 'master' of https://github.com/smike3/conky_w
hz2
Conflicts:
	conky_w
	conky_w.c~
	conky_w.o