better errors
merge
Merge branch 'master' of github.com:queuetue/chawkolate
cleanup
Basic workflow functional