Мелочи
Мелочи
Merge branch 'master' of github.com:pechkin/faynahata

Conflicts:
	app/views/layouts/application.html.erb