fixed authorization for deleting reviews
fixed merge conflicts in buses/show.html.erb and reviews controller
user receives sign up confirmation email
User deletes account, deletes associated reviews.
uninstalled psych to fix error
email to be sent upon adding review
Merge branch 'master' into JL_add_email
resolved merge conflicts
Conflicts:
	app/views/buses/show.html.erb
	db/schema.rb
users will now be emailed when their review has been upvoted or downvoted
fixed authorization, need to check tests
reviews index page
resolve merge conflict
format stuff
removed binding.pry in vote_email
resolved merge conflicts
resolved merge conflicts
Bus model method to sort string with numbers
Merge remote-tracking branch 'origin' into cp_bus_order
return of silver line
hound
remove ruby version