added current residence

Conflicts:
	timharris123.md