machines js
add table dynamically
fix error
add some colors
change colors
fix merge conflicts