make line draw smooth
Working canvas javascript
resolving conflicts
Merge pull request #7 from gopher-snakes-2013/resolve-merge-conflicts

Resolve merge conflicts