Setup
Merge branch 'master' of github.com:dmazin/asteroid-tycoon