Fix bug in binary heap, synchronize heap code in ch7 and app2
Fix bug that snuck into binary heap
Fix double-energy-spending bug in life simulation
Merge pull request #1 from marijnh/master

sync