Update server to avoid splitting
Merge pull request #4 from brtaylor92/master

Hw 2
Merge pull request #5 from brtaylor92/hw2

Hw2