Test Checkpoint so that we can revert to this if we screw up.
Fixed conflict for merge
Merge branch 'master' of https://github.com/NoNeedToBail/EECE281_DB