new styles
fixes merge conflict on styles
Merge pull request #74 from JustAboutJeff/style

new styles