testing photo upload
changed gemfile and database.yml
Merged conflicts
Removed Gemfile.lock
Added Gemfile.lock since heroku is desperate for it