fixing heroku
merg
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
	app/views/layouts/_header.html.erb
	config/initializers/instagram.rb
basic fixes
Added viewability. Only contributors can see private galleries. Anyone can see public galleries.
merged conflicts
Merge branch 'development' of github.com:deereb/competitive_instagram into development
sidebar fix
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/controllers/application_controller.rb
	config/environments/development.rb
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