Working on fixing the upheap
Merge branch 'master' of github.com:HugoSTorres/Barry_CS-331