Commit before pull
Merge branch 'master' of https://github.com/cameronkeif/Project1.git
Added touch class
added location, rotation, scale for entire drawing for easier
translation
added 'prototype' curve, I think we should have
view contains curve contains lines
instead of simply view contains lines
but we can talk about that...

verbose commit is bad commit