sidebar great
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	config/initializers/instagram.rb
minor sidebar fix
Merge branch 'master' of github.com:deereb/competitive_instagram

Conflicts:
	config/initializers/instagram.rb