fixed export conflicts
Merge branch 'master' of github.com:TejasManohar/math_rounds
merge