changed names
Merge branch 'master' of github.com:AliceYuan/SpaceAppsHackathon