closes #1
Merge origin/master
layout modelo inacabado
Merge origin/master