Merge pull request #1 from dyer004/master

First Revision Pull Request
Test 1 is complete and needs to be reviewd
Merge pull request #2 from bkinney91/test1Client

Test 1 is complete and needs to be reviewd
Merge pull request #1 from bkinney91/master

Pull Bryce's main()