fixing merge conflicts in canProduce
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga