client testing done
fixing bugs
passing?
Merge pull request #1 from nathanjordan/client_testing

client testing done