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

Conflicts:
	features/reminder.feature
feilaavia, mutta kommentoituja testejä