- footer layout
  - Twitter
  - Facebook
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia

Conflicts:
	css/style.css