updated merge conflict
Merge pull request #21 from CTFigueroa/master

updated merge conflict