bubble fest
Merge remote-tracking branch 'origin/nice-widget'

Conflicts:
	sort.c