First Address Is Added
city have been added here
Merge branch 'edit'

Conflicts:
	src/main/java/com/testing/Student.java