Commit before merge
Merged. Everything done in TreapMap except toString. Tests partially done.