Conflicts resolved and algebraist's style retained

complexno.py

@@ -8,6 +8,7 @@ class ComplexNumber:
 	def __str__(self):
 		return "(%s,%s)" %(self.real,self.img)
 
+
 	def __repr__(self):
 		return "ComplexNumber(real=%s,img=%s)" %(self.real,self.img)