added 3 questions
Merge remote-tracking branch 'upstream/master'
diagram included
Merge pull request #569 from adamarla/master

Added questions on conics (circles)