Merge pull request #4 from bparrish206/master

merging
Merge pull request #5 from bparrish206/dev

Merge pull request #4 from bparrish206/master