odfjasi
Merge branch 'coffeebreak' of https://github.com/hardbot/coffee into coffeebreak

Conflicts:
	read-command.c