adding changes to commit
Merge branch 'master' of https://github.com/stankud/planetary_defense