javascript drawing
working back
merge fix
please merge
fix conflicts
fix conflicts