commit
Merge branch 'master' of ssh://git@github.com/stephanefonte/Mail.git

Conflicts:
	src/letter/City.java