agregando //
agregando ///
Merge pull request #1 from maximerida/miscommits

agregando //
Merge pull request #2 from maximerida/master

agregando ///