Category bug looks fixed, but one cuke scenario still pending
Merge branch 'hw1-2' into hw1