Merge branch 'master' of /Users/Iman/PycharmProjects/WhoAmI with conflicts.
bug in rooms resolved