modified proof and format to catch some bugs
Merge branch 'master' of https://github.com/AnastasiaShuler/CS61BL_Project2

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

Conflicts:
	Proof.java