added more styling
updated merge conflict
Merge pull request #37 from CTFigueroa/master

Updated merge conflict