News show
News show
Merge branch 'dev' of github.com:kvakvs/erlanger_ru into dev

Conflicts:
	app/views/news/_column.html.erb
deleted 1 file
Merge remote-tracking branch 'dmitriid/dev' into dev

Conflicts:
	app/controllers/news_controller.rb
	app/views/news/_column.html.erb
	app/views/news/show.html.erb
@author
Merge remote-tracking branch 'dmitriid/dev' into dev

Conflicts:
	app/views/news/show.html.erb