tests updated
Merge branch 'Treaps' of https://github.com/GetzChris/CS314H into Treaps