Updated my ENV variables in application.yml
refactored twilio model methods
resolving merge conflict
adjustments to home page
fixed AlertsController current_user.id instead of current_user
sign in, log in, and edit pages