fixing the circle.java file
Merge branch 'repairBranch, getting circle.java'

Conflicts:
	Circle.java