Update
Merge branch 'master' of https://github.com/stankud/planetary_defense

Conflicts:
	app/controllers/sms_controller.rb