User avatars
Merge branch 'development' of github.com:deereb/competitive_instagram into development

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/gallery.rb
	db/schema.rb