Commits for SharkServer2
Merge pull request #38 from hw3/SharkServer2

Commits for SharkServer2