Trying to make progress
Merge branch 'master' of https://github.com/cs307-team13/scry