products added
resolved conflict
Ingredients added
conflich resolved
Merge branch 'r2_index' of github.com:faysalshahzad/panda_toys into r2_contact