add product history
Merge branch 'master' of github.com:QuentinBontemps/TrybaProject
Merge branch && fix conflicts