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

Conflicts:
	app/views/invoice/index.html.haml
refektorointia
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/views/invoice/index.html.haml