styling
merge conflicts
Merge pull request #13 from nealcpeters/neal

Neal