copied over changes from client to server
removed test comments and copied over encoder files from client to server
Merge pull request #7 from dsilva609/milestone2--cleanup

Milestone2  cleanup