add atom calculator to client
Fix MerkleCollapse
begin implementing the upload diffs for client
Merge pull request #159 from DavidVorick/upload

Fix MerkleCollapse