Local commit
Merge branch 'master' of https://github.com/leadrevolver/blist

Conflicts:
	build/blist
	makefile
Temporary non-working commit for progress transfer