removed some code
merge conflict gem file
styling pages and link to chats