reset change
Merge pull request #8 from JoshuaWordSmith/joshsFork

reset change