Fixed modals and added styling on categories index
resolved merging conflicts
minor styling
Merge branch 'master' of https://github.com/manonthemat/Wefridgerator
changed localhost links to heroku
Merge branch 'master' of https://github.com/manonthemat/Wefridgerator
m2x changes right before the presentation
m2x added to node server