#gtp-1 state: fixed work: 5h 30m News page and app layout
Merge branch 'master' of https://github.com/KernelCorp/genetic_podolsk

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb