Now you can draw lines and not just pixels.
fixed merge conflict with index.erb and draw.js
Merge branch 'master' of https://github.com/gopher-snakes-2013/draw_something_tjdb