stuff
Fix conflicts
Merge pull request #5 from adam-borzecki/feature/asteroid-generator

Feature/asteroid generator