solve conflict
add coffee to default
Merge branch 'master' of https://github.com/kobabasu/project