working
Merge branch 'master' of github.com:beebeeep/caudater

Conflicts:
	caudater.c
	config.conf