yks testi korjattu
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/views/billing/bill_email.html.haml