Merge pull request #2 from rahif/master

traduccion configuration
Added latest english changes on the guide
Update gii.md