Finished changes to all files
Merge branch 'master' of https://github.com/AnastasiaShuler/CS61BL_Project2

Conflicts:
	Proof.java
Merge branch 'master' of https://github.com/AnastasiaShuler/CS61BL_Project2