Merge branch 'master' of https://github.com/jayhf/APCS

Conflicts:
	Trees/files/test.pre
	Trees/src/DataCompression.java
	Trees/src/FileCompressor.java