Merge pull request #3 from calvinbrown085/testing-branch

Testing branch