conflicto
Merge branch 'front'
Merge pull request #13 from masfusion/front

Front