Resolved conflicts
Updates from the branch/blockly
Sets up the ram property based upon the current block count
Changes the way the battery and RAM HUD elements are updated
Resolved conflicts
Updates from the branch/blockly
Sets up the ram property based upon the current block count
Changes the way the battery and RAM HUD elements are updated
Merge branch 'branch/blockly' of https://github.com/virtual-world-framework/mars-game into branch/blockly
Changes the method and switches it to an event
Changes a variable name
Resolving issues from the pull request
Merge pull request #27 from virtual-world-framework/branch/blockly

Branch/blockly