Made functions better
Merge branch 'master' of https://github.com/dmazin/asteroid-tycoon