Implemented authorization with Cancan
User model implemented, have image selection and presenting, not uploading though
Start on recipe categories
Add image uploading/showing
CSS CHANGES
More CSS editing. Added navbar and modals
Attempt to resolve branch conflicts
Finish resolving conflicts
Fix production settings to have Heroku serve static assets
Fixed broken button issues
Touch up landing page