remove trash
Merge branch 'master' of https://github.com/Alerion/shopping-helper into history
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history
some changes to floating menu
fixed conflict
fixed conflict
fixed conflict history.js
Merge branch 'master' of https://github.com/Alerion/shopping-helper
resolved conflict
Merge branch 'master' of https://github.com/Alerion/shopping-helper into history
Merge branch 'master' of https://github.com/Alerion/shopping-helper
deleted ~ files
fixed conflict
fixrd conflict
backbone test.html