merged conflicts
removed header logo image
fixed instagram subscription logic
added new instagram api app
merged conflicts
Merge branch 'master' of github.com:deereb/competitive_instagram
Merge branch 'development'

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_header.html.erb
merged conflicts
Merge branch 'master' of github.com:deereb/competitive_instagram
merge
merge
gem lock
Merge branch 'development'
Merge branch 'master' of github.com:deereb/competitive_instagram

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/_header.html.erb
	config/initializers/instagram.rb
sidebar great
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	config/initializers/instagram.rb