added autoprefixer
merged conflicts