Fixed controllers to allow stories#index when not logged in
Change column in user table to accept empty string for photo, about_me, and home_town
Fixed merge conflicts