git pull
conflicts
merge from develop branch
application controller is finished
ref..ng friendships_controller
finished friendship
cleanup
refactred application helper
text formating
refactoring rooms
refactoring messages controller
merge conflicts
refactoring
first part refactoring
text refactoring
text to one format
refactor show method rooms controller
second part refactoring for room
and one more refactoring
finished