hashing added
Merge remote-tracking branch 'origin/master'

Conflicts:
	SchoolWork/src/bstStuff/Treap.java