fixed heap, added testing
merging
Merge branch 'master' of https://github.com/atokop/CS3114-Project3