Merge branch 'Kaitlin'
node.js can read fridge temperatures and update stored values in rails
Merge branch 'master' of https://github.com/manonthemat/Wefridgerator
Merge branch 'Kaitlin'
Merge branch 'master' of https://github.com/manonthemat/Wefridgerator
merging in other category file