new question
Merge pull request #574 from abhinavc/master

New question (conic sections)