{"shas":[["fb2ed65e089daeb3cd14af87fb3a9f77de53ac18","fae6bcf1c33df838b848835aecf419658669a255@gmail.com","Merge branch 'master' into haskell\n\nConflicts:\n\tcrypto/Encryption.java\n\tcrypto/EncryptionAssignment.java\n\tcrypto/plain.txt","Matt Senn"]],"ref":"refs/heads/haskell","size":1,"head":"fb2ed65e089daeb3cd14af87fb3a9f77de53ac18","push_id":43146589}