fixed merge conflicts
added carousel images and generic food images
fixed circle images, YAY
cleaned up login form
fix merge conflicts