Conflicts: app/assets/stylesheets/common.scss db/schema.rb
Attach a file by drag & drop or click to upload
