plää
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/controllers/settings_controller.rb
	app/views/settings/index.html.haml
jotain incoice juttui