mvp
fixed merge
Merge pull request #13 from egarza54/stylin

mvp