fahad's changes
Merge branch 'master' of https://github.com/hardbot/coffee

Conflicts:
	read-command.c