bin search
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	lists.hs