maybe conflicts resolved
so much sigh
Merge pull request #3 from dstavis/STYLING

maybe conflicts resolved