Uploading Images
Merge branch 'uploading-images'

Conflicts:
	Gemfile
	app/uploaders/avatar_uploader.rb
	app/views/devise/registrations/edit.html.erb
	app/views/layouts/application.html.erb
	app/views/posts/show.html.erb
	app/views/topics/show.html.erb
	db/schema.rb