Merge pull request #3 from gers0n/developer

modificacion del sabado conla flaca
Merge pull request #5 from gers0n/applying_bootstrap

Applying bootstrap
Merge pull request #7 from gers0n/applying_bootstrap

Applying bootstrap
Merge pull request #6 from gers0n/master

up date 27 sept 2014