upload S3 full
Merge branch 'feature/uploadpicture'
erge branch 'master' of https://github.com/AirBandB/airbandb

Conflicts:
	Gemfile.lock
	app/views/apartments/index.html.erb