bla
bla2
Merge branch 'receivemsg'

Conflicts:
	fester/integrate.c
	fester/main2.c
	hue.py
remove generated files