Merge remote-tracking branch 'origin/orbital_tomography-3d' into orbital_tomography-3d

proxtoolbox/Algorithms/SimpleAlgortihm.py

-# Simple Algortihm
-# Analog to AlgortihmWrapper in ProxMatlab
-
-from .algorithms import Algorithm
+# Simple Algorithm
+# Analog to AlgorithmWrapper in ProxMatlab
 
 from numpy import zeros, angle, trace, exp, sqrt, sum, ndarray
 from numpy.linalg import norm