some stuff with server-side blah
Merge branch 'master' of github.com:claireli/calhacks_encryption