Merge pull request #1 from cristiandley/develop

bootstrap y usuarios