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

Conflicts:
	config/database.yml
Syncing