added image compression
fixing gemfile merges