Styling/merge
Fix merge conflicts
Merge pull request #3 from JParker85/master

styling