Fixing attr names to match what the server sends back
Merge branch 'master' of github.com:pcsforeducation/internet_spaceship