tweaks for tree display
Merge branch 'master' of https://github.com/480Oswego2013/CSC-HCI-480-2013-repo

Conflicts:
	src/edu/oswego/csc480_hci521_2013/client/Entry.java