erge branch 'master' of github.com:deereb/competitive_instagram into development

Conflicts:
	config/initializers/instagram.rb
working sidebar
rge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	app/assets/stylesheets/galleries.css.scss
	config/initializers/instagram.rb
 If this is not correct, please remove the file
ii# and try again.