Merge branch 'master' into master

mathgenerator/funcs/definite_integral.py

@@ -1,4 +1,5 @@
 from .__init__ import *
+import scipy
 from scipy.integrate import quad
 
 

mathgenerator/funcs/is_prime.py

@@ -16,3 +16,7 @@ def isprime(max_a=100):
             return (problem, solution)
     solution = True
     return (problem, solution)
+
+
+is_prime = Generator('isprime', 90, 'a any positive integer',
+                     'True/False', isprime)

mathgenerator/mathgen.py

@@ -1,9 +1,6 @@
-import random
-import math
-import fractions
 from .funcs import *
 from .__init__ import getGenList
-import scipy
+
 
 genList = getGenList()