Added file upload and strong parameters
fixed merge conflicks