Merge branch 'master' into staging

Added the .pgpass file back or the app will crash
Merge branch 'develop' into staging

Added the structure of the about us, and contact info pages. Fixed some minor bugs in the presentation of the active page.
Merge branch 'staging'

Added the About us, contact information pages & fices some presentation & format bugs to the web site
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
Merge branch 'master' into develop

Added the hotfixes that adjusted the vide size so it does not overlap with the orders block