fixes merge conflicts
Merge branch 'add_photos'
authorization before edit/destroy, redirect to static page when no id found
added photo resizing options, and adding user_id to the database and entry forms