Fixed client/server issues?

I honestly didn't change anything of substance, but they weren't working
together before, and now they are.

http://i.imgur.com/x0ml8.png
Merge branch 'master' of github.com:louiswins/cse434-http