Pequeño cambio en css
Pequeños cambios en css
servimos video desde S3
Merge pull request #12 from consumo-colaborativo/media#S3

servimos video desde S3
puerto 80 y driver mongodb
enabling automatic deployment
Merge branch 'mgd-deploy' into develop
Merge branch 'develop'
Again minor change to automatic deployments
Merge branch 'develop'
Arreglos IE 11. bigVideo.js update
Moving deploy.sh

to fix error un github hook
gitignore
Actualizando librerías
Trying moving deploy.sh
Still deploy does not work, path conflict, try again
Re-writting deploy.sh
Merge branch 'master' into mgd-login

Conflicts:
	app.js
	app/server/router.js
	package.json