If the roots of the quadratic equation x2+px+q=0 are tan30o and tan15o then the value of 2 + q - p is