Primeros cambios
Merge pull request #1 from narc88/nicolas

Primeros cambios
Users
Merge pull request #2 from narc88/nick

Users
layout
 Please enter the commit message for your changes. Lines starting
Merge pull request #1 from marupiuma/maru

Maru