Checkpoint 6: sorta and sortd support
Fix minor issue
Add javadoc and test plan
Merge branch 'master' of
https://github.com/dannyju/leland-cs-ap-summer.git

Conflicts:
	TextExcel_CP5/src/leland/cs/ap/textexcel/Formula.java