Fixed a bug with the orders
Merge branch 'develop' into staging
Changed .gitignore
Added node_modules