Fixed SimPEG.__init__.py to include visulization (some merging issuse).

SimPEG/__init__.py

@@ -2,10 +2,6 @@ import utils
 from utils import Solver
 import mesh
 import inverse
-<<<<<<< HEAD
-from Solver import Solver
 import visulize
-=======
 import forward
 import regularization
->>>>>>> refs/remotes/origin/master