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

Conflicts:
	config/database.yml
Removed sid from asteroid
Merge branch 'master' of https://github.com/stankud/planetary_defender

Conflicts:
	app/controllers/sms_controller.rb