stuff
merge conflicts resolved
Merge pull request #62 from JavaRabbit/product

Product