Merge branch 'staging'

Added the About us, contact information pages & fices some presentation & format bugs to the web site
Merge branch 'staging'

This new version has the introductory video as well as a dummy demo page. I'll finish the demo for the December ITESM meeting, but the Startup Engineering contest is next week, so the dummy page will have to do for now.
Hot fix: changed video size to match smaller screens
Hot fix: changed video size to match smaller screens
Merge branch 'master' into develop

Added the hotfixes that adjusted the vide size so it does not overlap with the orders block
Merge branch 'develop' into staging

Added the hotfizes that resize the video to avoid overlap with the orders box