Ian got my Twilio text
removed line_id from all tables , added service_name to Alert
removing line table
stripping auth keys
modified seeds for testing
modified seeds for testing
trying to pull yaritza files in spite of migration differences
resolved merge conflict in gemfile
modified associations
added rake :text_each_alert, and added logic to TwilioWrapper and Alert Models
tweaked github
fixed migrations - this may cause problems for other people, build from schema if schema
blake screwed up, remigrated
working through some merge conflicts with Blake
Fix Devise Login
fixing the edit page
blake committing christinas changes from last night (also fixed merge conflicts using cherry-pick)

Conflicts:
	app/models/twilio_wrapper.rb
	app/views/alerts/new.html.erb
readding twilio wrapping after scrubbing it with the login credentials from the repo