Merge pull request #1 from norrislee18/newFeature

newFeature
Merge pull request #2 from norrislee18/newFeature

asdf
anewFeature