quadratic formula fixed
Merge branch 'master' of git@github.com:heike/sine-illusion