Commit before merging with david's implementation of restoreHeapProperty
Merge branch 'master' of github.com:arjunkarpur/prog6

Commit