Merge branch 'master' into master

mathgenerator/funcs/__init__.py

@@ -95,4 +95,8 @@ from .radian_to_deg import *
 from .differentiation import *
 from .definite_integral import *
 from .is_prime import *
+from .bcd_to_decimal import *
+from .complex_to_polar import *
+from .set_operation import *
+from .base_conversion import *
 from .curvedSurfaceAreaCylinderFunc import *