added reviews
Merge branch 'master' of https://github.com/stephanieguo/friendswap into feb9releaseViv

Conflicts:
	app/models/user.rb
	app/views/listings/listing.html.erb
	db/schema.rb