square

saquare
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngossip/ngossip.c