Added commands to add remove and list all chat rooms
added a lot of shit
conflict resolution
fixed stuff