commit to pull
Merge branch 'master' of http://github.com/haotianwang/CanvUs
Merge branch 'master' of http://github.com/haotianwang/CanvUs
refactored some code in lineThickness and renamed eraser.JPG to .jpg