solving some conflicts
merging with migrations
changed in my schema
changes in .DS_Store
commit to revert
Merge branch 'development' into C3_S0_Uploading_photos_form