Finishing merge
Merge pull request #13 from dgoodman1224/ss-dg-basic-style

Finishing merge