saved fixtures
changed fixtures
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history