222
1111
Merge branch 'master' of github.com:mrdre/mfc
111
Merge branch 'master' of github.com:mrdre/mfc

Conflicts:
	js/chat.js
Восстановление кнопок