first test commit
cleaning up repo
Merge branch 'master' of github.com:claireli/calhacks_encryption