Merge branch 'develop' into staging

Added the hotfizes that resize the video to avoid overlap with the orders box
Added new video & removed the order page since it wont be used for the demo
Added the carousel for the slide demo
Fixed merge conflics between demo & develop
Merge branch 'develop' into staging

Prepare the demo code to be staged into heroku
Merge branch 'staging'

This is the production version of the low-fidelity demo that uses a carousel for the slides that show the proposed tool usage.
Merge branch 'master' into develop

Heroku sent a message asking me to upgrade to the newest version of nmp and node
Updaded package.json to include newest version of node & npm
Merge branch 'develop' into staging

Changed to latest version of node & npm
Fixed small bug
Merge branch 'staging' into develop

Fixed small bug in the demo page
Merge branch 'staging'

Added small fix on the demo page & updated to the latest version of node & npm
Merge branch 'master' into develop

Added fixed on versioning & small bug on the demo page