imported DiffBoundsPrinter in Diff.java
added getting of diffs to diffBoundsTest
Resolved conflicts in DiffBoundsTest.java