Fixed estimating height of ingredients listview
Merge branch 'master' of ssh://github.com/Torboto/cmput301W13T07
Fixing up merge conflicts for Adam