testejä ja ylimääräisen poistoa
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/controllers/reminder_controller.rb
	spec/controllers/invoice_controller_spec.rb
	spec/controllers/reminder_controller_spec.rb
	spec/controllers/settings_controller_spec.rb