Add chat
fix conflict
Merge branch 'master' of https://github.com/Tomesch/where-on-earth