Added demo page, fixed references to it on the other pages. The contact us page is merged into the about us page
Changes on the social buttons & the basic structure of the demo page
Added the sticky footer to all the web pages with the exception of the main page
Fixed bug on sticky footer on the about page. Demo page had incorrect tab title
Merge branch 'demo' into develop

Added new demo page and the sticky footer to all other pages.
New layout for the demo, uses fluid elements and a row of input elements, one for each media pane
Added the video file & removed the demo page. This is intened for the startup engineering contest and I don't have time to finish the demo in time
Merge branch 'demo' into develop

Merged the demo branch, but disabled the demo since it won't be ready for the test phase of the Startup Engineering contest
Merge branch 'develop' into staging

Merged the develop branch. It contains the video and a dummy demo page
Merge branch 'staging' into develop

Fixed an error in the dummy demo page revealed by the w3 validator, easily fixed thorugh CSS
Fixed bug in dummy page
Merge branch 'develop' into staging

Fixed a bug in the dummy page found with the w3 validator
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