picture uploading works now (I used carrierwave)
fixed merge conflicts