heroku test
heroku test
s3 upload test
Merge branch 'feature/upload'
other gem test
heroku test
heroku test
heroku
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects_controller.rb
	app/views/projects/_form.html.erb
	db/schema.rb
fix error