Working on subsciptions
show.erb
Merge branch 'feature/fetch_current_user_media' of github.com:deereb/competitive_instagram into feature_pull_real_time

Conflicts:
	app/controllers/images_controller.rb
	app/views/users/show.html.erb
Merge branch 'development' into feature_pull_real_time

Conflicts:
	app/models/user.rb
update image model to use SELF.user.name and SELF.gallery.name