Attempting to get git-crypt to work
Merge branches 'master' and 'master' of https://github.com/kenlimmj/cs3300