adding a testfile to test a branch repository with Volodya
test2
Merge branch 'dashboard' of https://github.com/Alerion/shopping-helper into dashboard
fdsfsd
merrging test
mreging test
changed bootstrap
Merge branch 'history' of https://github.com/Alerion/shopping-helper into test
fixed nav
deleted bootstrap 3
Merge branch 'test' of https://github.com/Alerion/shopping-helper into test
merge test
merge test
Merge branch 'test' of https://github.com/Alerion/shopping-helper into test
merged test
Merge pull request #24 from Alerion/useradmin

Useradmin
Merge branch 'test' of https://github.com/Alerion/shopping-helper into test
Merge pull request #28 from Alerion/history

History
Merge branch 'master' into dashboard
Merge branch 'master' into statistics