render planet table
add modal; planet choice
fix merge conflict
Merge branch 'master' of github.com:HacktheUniverse/space-pioneers