herokuun
herokuu
herokuun
heroo
herokuaa
tyylejä napeille
css
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/views/billing/reminder_email.html.haml
Merge branch 'master' of github.com:kantoliinary/kantoliina
Merge branch 'master' of heroku.com:kantoliina

Conflicts:
	spec/controllers/invoice_controller_spec.rb
Merge branch 'master' of github.com:kantoliinary/kantoliina
Merge branch 'master' of github.com:kantoliinary/kantoliina
Merge branch 'master' of github.com:kantoliinary/kantoliina
linkki
Merge branch 'master' of github.com:kantoliinary/kantoliina