added server
Merge branch 'master' of github.com:akbiggs/spaceapps