Merge pull request #1 from AnthonyReid99/master

Getting up to date
Merge pull request #1 from mdhausman/master

Merge pull request #1 from AnthonyReid99/master