Assignment 7
Merge branch 'master' of github.com:MadcowD/CS2420

Conflicts:
	Assignments/src/assignment6/BSTtester.java