added logging
Merge branch 'master' of github.com:michealharker/barista

Conflicts:
	README.md