added folder history
Merge branches 'history' and 'master' of https://github.com/Alerion/shopping-helper
Merge branch 'master' of https://github.com/Alerion/shopping-helper into dashboard