more js

diff --cc src/java/iotcloud/Slot.java
index 1d84baad65331227ffaab78c1a89932f35658c53,d23e5c1b86dd76cb0c215b84d1b954ba4ac8fa15..c114a8762c0eba7f83fdfe03178fc89000ffca5a
--- 1/src/java/iotcloud/Slot.java
--- 2/src/java/iotcloud/Slot.java
+++ b/src/java/iotcloud/Slot.java
@@@ -29,14 -27,16 +27,16 @@@ class Slot implements Liveness 
        /** Vector of entries in this slot. */
        private Vector<Entry> entries;
        /** Pieces of information that are live. */
 -      private int livecount;
 +      private int livecount;//
        /** Flag that indicates whether this slot is still live for
         * recording the machine that sent it. */
 -      private boolean seqnumlive;
 +      private boolean seqnumlive;//
        /** Number of bytes of free space. */
        private int freespace;
+       /** Reference to Table */
+       private Table table;
  
-       Slot(long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) {
+       Slot(Table _table, long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) {
                seqnum=_seqnum;
                machineid=_machineid;
                prevhmac=_prevhmac;
@@@ -45,14 -45,15 +45,20 @@@
                livecount=1;
                seqnumlive=true;
                freespace = SLOT_SIZE - getBaseSize();
+               table=_table;
        }
  
-       Slot(long _seqnum, long _machineid, byte[] _prevhmac) {
-               this(_seqnum, _machineid, _prevhmac, null);
+       Slot(Table _table, long _seqnum, long _machineid, byte[] _prevhmac) {
+               this(_table, _seqnum, _machineid, _prevhmac, null);
        }
  
++<<<<<<< HEAD
 +      Slot(long _seqnum, long _machineid) {
 +              this(_seqnum, _machineid, new byte[ HMAC_SIZE], null);
++=======
+       Slot(Table _table, long _seqnum, long _machineid) {
+               this(_table, _seqnum, _machineid, new byte[HMAC_SIZE], null);
++>>>>>>> f80cc30f294899f47cef3507334f8ca357862e5e
        }
  
        byte[] getHMAC() {