Added new coffee colors
Merge pull request #136 from j-rewerts/master

Added new coffee colors
Merge remote-tracking branch 'upstream/master' into question_view_refactoring