Standardized variable names
Resolved conflicts

Fixed JSON writer to work with conflicts syncing with master regarding
the X and Y values given to nodes