Added store.js
Painfully basic formatting tweaks
Fixed merge conflict