Changed to scrum master and developer
Merge branch 'master' of https://github.com/funIntentions/chitchat