fixed authorization for deleting reviews
fixed merge conflicts in buses/show.html.erb and reviews controller
user receives sign up confirmation email
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
removed binding.pry in vote_email
resolved merge conflicts
resolved merge conflicts
appease the hound
fixed spec
removed binding.pry
trying to fix delete vote
fix merge conflicts
fixed vote delete problem
Merge branch 'master' of github.com:LaunchAcademy/ok_bus
resolve merge conflict
Merge pull request #53 from LaunchAcademy/JL_fix_delete_votes

RFR - JL - fixed vote delete problem