update talk
update talk
fix city
Merge pull request #102 from efernie/master

talk proposal