text adventures!
update link to chatroom wording
resolve merge conflict