Merge remote-tracking branch 'origin/master'

Conflicts:
	README
	draw.c
	dzen.h
	main.c