my own changes
Merge branch 'master' of https://github.com/djorda9/Simulated-Conversations