Updated readme
Merge branch 'refs/heads/master' into feature/room-list