changes to client
Merge branch 'master' of github.com:calvinmm/hack-tx-2013
Merge branch 'master' of github.com:calvinmm/hack-tx-2013
Merge branch 'master' of github.com:calvinmm/hack-tx-2013
protocol works now
Merge branch 'master' of github.com:calvinmm/hack-tx-2013