removed public/js/ from git ignore
Added ocanvas
Merge remote-tracking branch 'origin/master'