страница пользователя
Merge remote-tracking branch 'origin/master'

Conflicts:
	HOBBIE/room/templates/rooms.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
страница пользователя
Merge remote-tracking branch 'origin/master'

Conflicts:
	HOBBIE/db.sqlite3