first commit
Merge https://github.com/barolfe/satellites