review fix: fixed merge error, added comment
Merge branch 'feature/upload_state_on_signup'
Added items to the initial shopping list
use local istanbul, ci to run coverage reports, updated readme
increased timeout on FSIO tests from 3 to 10 seconds
Correct typos
Merge branch 'feature/more_items'
Merge branch 'master' into tooltips