added etsy gem, changed environment.rb
accepting changes in gemfile, environment.rb
finished merge from master
removed old card_images folder
added photos and pulled assets from etsy for cards