fixed json formatting again
renamed playerinfo.resourcepercent to playerinfo.resourcespercent
added commodities to models/playerinfo.js
Merge branch 'master' of https://github.com/AliceYuan/SpaceAppsHackathon