claire almost dying, holy crap. D:
Merge branch 'master' of github.com:claireli/calhacks_encryption