Merge pull request #15 from jonrish/styling

Styling
add extra line
fix merge conflicts