Убрал код, использующийся для дебаггинга
Merge branch 'master' into deployment

Conflicts:
	app/controllers/flashcards_controller.rb
	app/controllers/repetitions_controller.rb
	app/models/flashcard.rb
	app/models/user.rb
	app/views/layouts/_menu.html.erb
	app/views/repetitions/index.html.erb
Merge branch 'master' into deployment
Merge branch 'master' into deployment
Merge branch 'master' into deployment

Conflicts:
	app/controllers/repetitions_controller.rb
	app/views/repetitions/index.html.erb
Merge branch 'master' into deployment
Merge branch 'master' into deployment

Conflicts:
	app/controllers/repetitions_controller.rb
	app/views/repetitions/index.html.erb
Merge branch 'master' into deployment
Merge branch 'master' into deployment
Merge branch 'master' into deployment

Conflicts:
	app/controllers/flashcards_controller.rb
Merge branch 'master' into deployment

Conflicts:
	app/controllers/flashcards_controller.rb
Merge branch 'master' into deployment
Изменены файлы настроек для работы с PostgreSQL
Изменения в todo
Merge branch 'master' into deployment
Merge branch 'master' into deployment
Merge branch 'master' into deployment

Conflicts:
	app/views/repetitions/index.html.erb
Merge branch 'master' into deployment
Merge branch 'master' into deployment
Merge branch 'master' into deployment

Conflicts:
	todo