Pre-merge
Merge branch 'master' of github.com:vivianh/catchphrase
Pre-merge
Merged conflict
Chat tries to show who the person writing is