Merge pull request #5 from bsmith95610/test-branch2

mergingggggg
Update test2
Merge pull request #6 from bsmith95610/master

Updating test-branch2 with most up to date code.