manually added attachment tables to cities and startups
added attr_accessor :photo_file_name to city.rb
merged conflicts