fix merge conflict
Merge branch 'view/create_gallery' of github.com:deereb/competitive_instagram into feature/create_gallery_pt2
add view-galleries-show
merge conflict re: gemlock file removed
view galleries index