Merge pull request #11 from JairoAlonso25/master

Merging changes
Merge pull request #12 from JairoAlonso25/master

Sync
Merge pull request #13 from JairoAlonso25/master

Sync
rewrite at 50%

rewriting all the sentences to make them sense
Merge pull request #3 from pedropaG/master

warning with conflicts