Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
updates
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
updated logic on home.html to appropriately show measurements when taking measurements into account
updated ingredient edit in home.html to have a dropdown list of measurement types to match those in the recipeForm.html view
fixed the NaN for ingredient amounts rendering on home.html view after submitting a new recipe
Merge pull request #46 from CTFigueroa/master

'fixed the NaN for ingredient amounts rendering on home.html view after submitting a new recipe'