hope i didn't fck everything up
Merge branch 'master' of https://github.com/claireli/calhacks_encryption