switching branches
switching branches
merge branch 'development' of github.com:deereb/competitive_instagram into development
switching branches
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/controllers/users_controller.rb
merge
process subscription method edit