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

Conflicts:
	Gemfile