foo
Merge branch 'master' of github.com:jamer/bs

Conflicts:
	bs.c