These are almost done... just need to finish adding test cases and differences from proposals
Merge branch 'master' of https://github.com/jeba1858/CSCI3308-Project