initial commit
Merge branch 'master' of github.com:beeglebug/space-man