succesfully migrated, gemfile modified
photogallery show view modified
list of photos in show-view became sortable for admin
photos are draggable only for admin in show-view
photogallery edit-view finished
photogallery edit-vew finished without css
article model and controller created
fixed conflicts
fixed conflicts merge with development