fixed bugs, done cept for script
Merge branch 'master' of https://github.com/stuydw/curves